X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98438730495809c7ebde7edee634e72265d1fe81..7ca4ac63835adef8226b655013a8a84b416c8171:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index e3be7dfb7b..3bd9d7c1bb 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filefn.cpp +// Name: src/common/filefn.cpp // Purpose: File- and directory-related functions // Author: Julian Smart // Modified by: @@ -17,20 +17,19 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "filefn.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" #ifdef __BORLANDC__ #pragma hdrstop #endif -#include "wx/utils.h" -#include "wx/intl.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" +#endif + #include "wx/file.h" // This does include filefn.h #include "wx/filename.h" #include "wx/dir.h" @@ -44,7 +43,7 @@ #include #include #include -#if !defined(__WATCOMC__) +#if !wxONLY_WATCOM_EARLIER_THAN(1,4) #if !(defined(_MSC_VER) && (_MSC_VER > 800)) #include #endif @@ -54,13 +53,6 @@ #include "wx/mac/private.h" // includes mac headers #endif -#include "wx/log.h" - -// No, Cygwin doesn't appear to have fnmatch.h after all. -#if defined(HAVE_FNMATCH_H) - #include "fnmatch.h" -#endif - #ifdef __WINDOWS__ #include "wx/msw/private.h" #include "wx/msw/mslu.h" @@ -172,7 +164,7 @@ void wxPathList::Add (const wxString& path) } // Add paths e.g. from the PATH environment variable -void wxPathList::AddEnvList (const wxString& envVariable) +void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable)) { // No environment variables on WinCE #ifndef __WXWINCE__ @@ -183,14 +175,14 @@ void wxPathList::AddEnvList (const wxString& envVariable) 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) +// wxT(" ;"); // Don't separate with colon in DOS (used for drive) + wxT(";"); // Don't separate with colon in DOS (used for drive) #else wxT(" :;"); #endif - wxChar *val = wxGetenv (WXSTRINGCAST envVariable); - if (val && *val) + wxString val ; + if (wxGetEnv (WXSTRINGCAST envVariable, &val)) { wxChar *s = MYcopystring (val); wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr); @@ -214,9 +206,7 @@ void wxPathList::AddEnvList (const wxString& envVariable) delete [] s; } -#else // __WXWINCE__ - wxUnusedVar(envVariable); -#endif // !__WXWINCE__/__WXWINCE__ +#endif // !__WXWINCE__ } // Given a full filename (with path), ensure that that file can @@ -253,8 +243,7 @@ bool wxPathList::Member (const wxString& path) wxString wxPathList::FindValidPath (const wxString& file) { - if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file))) - return wxString(wxFileFunctionsBuffer); + wxExpandPath(wxFileFunctionsBuffer, file); wxChar buf[_MAXPATHLEN]; wxStrcpy(buf, wxFileFunctionsBuffer); @@ -263,7 +252,7 @@ wxString wxPathList::FindValidPath (const wxString& file) for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext()) { - const wxChar *path = node->GetData(); + const wxString path(node->GetData()); wxStrcpy (wxFileFunctionsBuffer, path); wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1]; if (ch != wxT('\\') && ch != wxT('/')) @@ -287,8 +276,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) if ( f.empty() || wxIsAbsolutePath(f) ) return f; - wxString buf; - wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN); + wxString buf = ::wxGetCwd(); if ( !wxEndsWithPathSeparator(buf) ) { @@ -313,7 +301,12 @@ wxFileExists (const wxString& filename) #else // !__WIN32__ wxStructStat st; #ifndef wxNEED_WX_UNISTD_H - return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG); + return (wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG)) +#ifdef __OS2__ + || (errno == EACCES) // if access is denied something with that name + // exists and is opened in exclusive mode. +#endif + ; #else return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG); #endif @@ -360,24 +353,24 @@ wxIsAbsolutePath (const wxString& filename) void wxStripExtension(wxChar *buffer) { - int len = wxStrlen(buffer); - int i = len-1; - while (i > 0) - { - if (buffer[i] == wxT('.')) + int len = wxStrlen(buffer); + int i = len-1; + while (i > 0) { - buffer[i] = 0; - break; + if (buffer[i] == wxT('.')) + { + buffer[i] = 0; + break; + } + i --; } - i --; - } } void wxStripExtension(wxString& buffer) { //RN: Be careful about the handling the case where - //buffer.Length() == 0 - for(size_t i = buffer.Length() - 1; i != wxString::npos; --i) + //buffer.length() == 0 + for(size_t i = buffer.length() - 1; i != wxString::npos; --i) { if (buffer.GetChar(i) == wxT('.')) { @@ -443,28 +436,38 @@ wxChar *wxRealPath (wxChar *path) return path; } +wxString wxRealPath(const wxString& path) +{ + wxChar *buf1=MYcopystring(path); + wxChar *buf2=wxRealPath(buf1); + wxString buf(buf2); + delete [] buf1; + return buf; +} + + // Must be destroyed wxChar *wxCopyAbsolutePath(const wxString& filename) { - if (filename.empty()) - return (wxChar *) NULL; + if (filename.empty()) + return (wxChar *) NULL; - if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) { - wxChar buf[_MAXPATHLEN]; - buf[0] = wxT('\0'); - wxGetWorkingDirectory(buf, WXSIZEOF(buf)); - wxChar ch = buf[wxStrlen(buf) - 1]; + if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) + { + wxString buf = ::wxGetCwd(); + wxChar ch = buf.Last(); #ifdef __WXMSW__ - if (ch != wxT('\\') && ch != wxT('/')) - wxStrcat(buf, wxT("\\")); + if (ch != wxT('\\') && ch != wxT('/')) + buf << wxT("\\"); #else - if (ch != wxT('/')) - wxStrcat(buf, wxT("/")); + if (ch != wxT('/')) + buf << wxT("/"); #endif - wxStrcat(buf, wxFileFunctionsBuffer); - return MYcopystring( wxRealPath(buf) ); - } - return MYcopystring( wxFileFunctionsBuffer ); + buf << wxFileFunctionsBuffer; + buf = wxRealPath( buf ); + return MYcopystring( buf ); + } + return MYcopystring( wxFileFunctionsBuffer ); } /*- @@ -553,7 +556,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) while ((*d++ = *s) != 0) { # ifndef __WXMSW__ if (*s == wxT('\\')) { - if ((*(d - 1) = *++s)) { + if ((*(d - 1) = *++s)!=0) { s++; continue; } else @@ -619,11 +622,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) nnm = *s ? s + 1 : s; *s = 0; // 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; + if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) + { + if (was_sep) /* replace only if it was there: */ + *s = SEP; s = NULL; - } else { + } + else + { nm = nnm; s = home; } @@ -657,7 +663,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) The call wxExpandPath can convert these back! */ wxChar * -wxContractPath (const wxString& filename, const wxString& envname, const wxString& user) +wxContractPath (const wxString& filename, + const wxString& WXUNUSED_IN_WINCE(envname), + const wxString& user) { static wxChar dest[_MAXPATHLEN]; @@ -683,8 +691,6 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin wxStrcat (tcp, wxT("}")); wxStrcat (tcp, wxFileFunctionsBuffer); } -#else - wxUnusedVar(envname); #endif // Handle User's home (ignore root homes!) @@ -798,7 +804,7 @@ wxString wxPathOnly (const wxString& path) // Local copy wxStrcpy (buf, WXSTRINGCAST path); - int l = path.Length(); + int l = path.length(); int i = l - 1; // Search backward for a backward or forward slash @@ -959,39 +965,38 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) ) bool wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) { - wxString outfile; - if ( !wxGetTempFileName( wxT("cat"), outfile) ) - return false; - - 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 || - (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL) +#if wxUSE_FILE + + wxFile in1(file1), in2(file2); + wxTempFile out(file3); + + if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() ) + return false; + + ssize_t ofs; + unsigned char buf[1024]; + + for( int i=0; i<2; i++) { - if (fp1) - fclose (fp1); - if (fp2) - fclose (fp2); - if (fp3) - fclose (fp3); - return false; + wxFile *in = i==0 ? &in1 : &in2; + do{ + if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false; + if ( ofs > 0 ) + if ( !out.Write(buf,ofs) ) + return false; + } while ( ofs == (ssize_t)WXSIZEOF(buf) ); } - int ch; - while ((ch = getc (fp1)) != EOF) - (void) putc (ch, fp3); - fclose (fp1); + return out.Commit(); - while ((ch = getc (fp2)) != EOF) - (void) putc (ch, fp3); - fclose (fp2); +#else - fclose (fp3); - bool result = wxRenameFile(outfile, file3); - return result; + wxUnusedVar(file1); + wxUnusedVar(file2); + wxUnusedVar(file3); + return false; + +#endif } // Copy files @@ -1011,7 +1016,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) return false; } #elif defined(__OS2__) - if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 ) + if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 ) return false; #elif defined(__PALMOS__) // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/ @@ -1102,8 +1107,19 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) } bool -wxRenameFile (const wxString& file1, const wxString& file2) +wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite) { + if ( !overwrite && wxFileExists(file2) ) + { + wxLogSysError + ( + _("Failed to rename the file '%s' to '%s' because the destination file already exists."), + file1.c_str(), file2.c_str() + ); + + return false; + } + #if !defined(__WXWINCE__) && !defined(__WXPALMOS__) // Normal system call if ( wxRename (file1, file2) == 0 ) @@ -1111,7 +1127,7 @@ wxRenameFile (const wxString& file1, const wxString& file2) #endif // Try to copy - if (wxCopyFile(file1, file2)) { + if (wxCopyFile(file1, file2, overwrite)) { wxRemoveFile(file1); return true; } @@ -1159,6 +1175,7 @@ bool wxMkdir(const wxString& dir, int perm) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #endif #elif defined(__OS2__) + wxUnusedVar(perm); if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? #elif defined(__DOS__) #if defined(__WATCOMC__) @@ -1236,7 +1253,13 @@ bool wxDirExists(const wxChar *pszPathName) return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY); #elif defined(__OS2__) - return (::DosSetCurrentDir(WXSTRINGCAST strPath)); + FILESTATUS3 Info = {{0}}; + APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD, + (void*) &Info, sizeof(FILESTATUS3)); + + return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) || + (rc == ERROR_SHARING_VIOLATION); + // If we got a sharing violation, there must be something with this name. #else // !__WIN32__ wxStructStat st; @@ -1339,18 +1362,22 @@ wxString wxFindNextFile() // Get current working directory. -// If buf is NULL, allocates space using new, else -// copies into buf. -wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) +// If buf is NULL, allocates space using new, else copies into buf. +// wxGetWorkingDirectory() is obsolete, use wxGetCwd() +// wxDoGetCwd() is their common core to be moved +// to wxGetCwd() once wxGetWorkingDirectory() will be removed. +// Do not expose wxDoGetCwd in headers! + +wxChar *wxDoGetCwd(wxChar *buf, int sz) { #if defined(__WXPALMOS__) - // TODO ? - return NULL; + // TODO + if(buf && sz>0) buf[0] = _T('\0'); + return buf; #elif defined(__WXWINCE__) // TODO - wxUnusedVar(buf); - wxUnusedVar(sz); - return NULL; + if(buf && sz>0) buf[0] = _T('\0'); + return buf; #else if ( !buf ) { @@ -1367,10 +1394,6 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) bool needsANSI = true; #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU - // This is not legal code as the compiler - // is allowed destroy the wxCharBuffer. - // wxCharBuffer c_buffer(sz); - // char *cbuf = (char*)(const char*)c_buffer; char cbuf[_MAXPATHLEN]; #endif @@ -1414,7 +1437,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) ,cbuf + 3 ,(PULONG)&sz ); - cbuf[0] = 'A' + (ulDriveNum - 1); + cbuf[0] = char('A' + (ulDriveNum - 1)); cbuf[1] = ':'; cbuf[2] = '\\'; ok = rc == 0; @@ -1456,7 +1479,13 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) #if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) // another example of DOS/Unix mix (Cygwin) wxString pathUnix = buf; +#if wxUSE_UNICODE + char bufA[_MAXPATHLEN]; + cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA); + wxConvFile.MB2WC(buf, bufA, sz); +#else cygwin_conv_to_full_win32_path(pathUnix, buf); +#endif // wxUSE_UNICODE #endif // __CYGWIN__ } @@ -1470,13 +1499,17 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) // __WXWINCE__ } -wxString wxGetCwd() +#if WXWIN_COMPATIBILITY_2_6 +wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) { - wxChar *buffer = new wxChar[_MAXPATHLEN]; - wxGetWorkingDirectory(buffer, _MAXPATHLEN); - wxString str( buffer ); - delete [] buffer; + return wxDoGetCwd(buf,sz); +} +#endif // WXWIN_COMPATIBILITY_2_6 +wxString wxGetCwd() +{ + wxString str; + wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN); return str; } @@ -1602,46 +1635,11 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) { -#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); - 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")); - } + wxDateTime mtime; + if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) ) + return (time_t)-1; - 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 + return mtime.GetTicks(); } @@ -1649,7 +1647,9 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) // Returns 0 if none or if there's a problem. // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg" -int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr, wxArrayString& descriptions, wxArrayString& filters) +int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr, + wxArrayString& descriptions, + wxArrayString& filters) { descriptions.Clear(); filters.Clear(); @@ -1781,127 +1781,109 @@ bool wxIsWild( const wxString& pattern ) * Written By Douglas A. Lewis * * The match procedure is public domain code (from ircII's reg.c) +* but modified to suit our tastes (RN: No "%" syntax I guess) */ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) { - if (text.empty()) + if (text.empty()) + { + /* Match if both are empty. */ + return pat.empty(); + } + + const wxChar *m = pat.c_str(), + *n = text.c_str(), + *ma = NULL, + *na = NULL; + int just = 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('*')) { - /* Match if both are empty. */ - return pat.empty(); + ma = ++m; + na = n; + just = 1; + acount = count; } - - 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('.'))) + else if (*m == wxT('?')) { - /* Never match so that hidden Unix files - * are never found. */ + m++; + if (!*n++) return false; } - - for (;;) + else { - if (*m == wxT('*')) - { - ma = ++m; - na = n; - just = 1; - mp = NULL; - acount = count; - } - else if (*m == wxT('?')) + 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++; + count++; + n++; + } + 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 (ma) { - m++; - if (!*n++) - return false; + m = ma; + n = ++na; + count = acount; } 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 - { - - 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; - } - } + return false; + } } + } } // Return the type of an open file @@ -1967,12 +1949,11 @@ wxFileKind wxGetFileKind(FILE *fp) { // Note: The watcom rtl dll doesn't have fileno (the static lib does). // Should be fixed in version 1.4. -#if defined(wxFILEKIND_STUB) || \ - (defined(__WATCOMC__) && __WATCOMC__ <= 1230 && defined(__SW_BR)) +#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4) (void)fp; return wxFILE_KIND_DISK; #else - return wxGetFileKind(fileno(fp)); + return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN; #endif }