X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ade35f11fe3931202fb44a08c7fcdd56751ff20d..0f5378d414cb68caaa535199c1af12dec1720c3d:/src/common/filefn.cpp?ds=sidebyside diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 8346e0eae8..cb035c4407 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filefn.cpp +// Name: src/common/filefn.cpp // Purpose: File- and directory-related functions // Author: Julian Smart // Modified by: // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,22 +17,28 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #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" +#include "wx/filefn.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/crt.h" +#endif + +#include "wx/dynarray.h" #include "wx/file.h" #include "wx/filename.h" +#include "wx/dir.h" + +#include "wx/tokenzr.h" // there are just too many of those... #ifdef __VISUALC__ @@ -43,223 +49,233 @@ #include #include #include -#if !defined(__WATCOMC__) +#if !wxONLY_WATCOM_EARLIER_THAN(1,4) #if !(defined(_MSC_VER) && (_MSC_VER > 800)) #include #endif #endif -#include - -#ifndef __MWERKS__ - #include - #include -#else - #include - #include - #include -#endif - -#ifdef __UNIX__ - #include - #include +#if defined(__WXMAC__) + #include "wx/osx/private.h" // includes mac headers #endif -#ifdef __WXPM__ - #include - #include "wx/os2/private.h" -#endif -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) -#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) - #include - #include - #include -#endif // __WINDOWS__ -#endif // native Win compiler +#ifdef __WINDOWS__ + #include "wx/msw/private.h" + #include "wx/msw/missing.h" + #include "wx/msw/mslu.h" -#ifdef __GNUWIN32__ - #include - #ifndef __TWIN32__ - #include + // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path() + // and for cygwin_conv_path() + // + // note that it must be included after + #ifdef __GNUWIN32__ + #ifdef __CYGWIN__ + #include + #include + #endif + #endif // __GNUWIN32__ + + // io.h is needed for _get_osfhandle() + // Already included by filefn.h for many Windows compilers + #if defined __CYGWIN__ + #include #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 -#endif - -#ifdef __SALFORDC__ - #include - #include -#endif - -#include "wx/setup.h" -#include "wx/log.h" +#endif // __WINDOWS__ -// No, Cygwin doesn't appear to have fnmatch.h after all. -#if defined(HAVE_FNMATCH_H) - #include "fnmatch.h" +#if defined(__VMS__) + #include #endif -#ifdef __WINDOWS__ - #include +// TODO: Borland probably has _wgetcwd as well? +#ifdef _MSC_VER + #define HAVE_WGETCWD #endif // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -#define _MAXPATHLEN 500 - -extern wxChar *wxBuffer; - -#ifdef __WXMAC__ -# include "MoreFiles.h" -# include "MoreFilesExtras.h" -# include "FullPath.h" -# include "FSpCompat.h" +#ifndef _MAXPATHLEN + #define _MAXPATHLEN 1024 #endif -IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) - // ---------------------------------------------------------------------------- // private globals // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_8 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; +#endif #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; +const int wxInvalidOffset = -1; #endif +// ============================================================================ +// implementation +// ============================================================================ + // ---------------------------------------------------------------------------- -// macros +// wrappers around standard POSIX functions // ---------------------------------------------------------------------------- -// we need to translate Mac filenames before passing them to OS functions -#define OS_FILENAME(s) (s.fn_str()) +#if wxUSE_UNICODE && defined __BORLANDC__ \ + && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551 -// ============================================================================ -// implementation -// ============================================================================ +// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only +// regardless of the mode parameter. This hack works around the problem by +// setting the mode with _wchmod. +// +int wxCRT_OpenW(const wchar_t *pathname, int flags, mode_t mode) +{ + int moreflags = 0; + + // we only want to fix the mode when the file is actually created, so + // when creating first try doing it O_EXCL so we can tell if the file + // was already there. + if ((flags & O_CREAT) && !(flags & O_EXCL) && (mode & wxS_IWUSR) != 0) + moreflags = O_EXCL; + + int fd = _wopen(pathname, flags | moreflags, mode); + + // the file was actually created and needs fixing + if (fd != -1 && (flags & O_CREAT) != 0 && (mode & wxS_IWUSR) != 0) + { + close(fd); + _wchmod(pathname, mode); + fd = _wopen(pathname, flags & ~(O_EXCL | O_CREAT)); + } + // the open failed, but it may have been because the added O_EXCL stopped + // the opening of an existing file, so try again without. + else if (fd == -1 && moreflags != 0) + { + fd = _wopen(pathname, flags & ~O_CREAT); + } + + return fd; +} + +#endif -void wxPathList::Add (const wxString& path) +// ---------------------------------------------------------------------------- +// wxPathList +// ---------------------------------------------------------------------------- + +bool wxPathList::Add(const wxString& path) +{ + // add a path separator to force wxFileName to interpret it always as a directory + // (i.e. if we are called with '/home/user' we want to consider it a folder and + // not, as wxFileName would consider, a filename). + wxFileName fn(path + wxFileName::GetPathSeparator()); + + // add only normalized relative/absolute paths + // NB: we won't do wxPATH_NORM_DOTS in order to avoid problems when trying to + // normalize paths which starts with ".." (which can be normalized only if + // we use also wxPATH_NORM_ABSOLUTE - which we don't want to use). + if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS)) + return false; + + wxString toadd = fn.GetPath(); + if (Index(toadd) == wxNOT_FOUND) + wxArrayString::Add(toadd); // do not add duplicates + + return true; +} + +void wxPathList::Add(const wxArrayString &arr) { - wxStringList::Add (WXSTRINGCAST path); + for (size_t j=0; j < arr.GetCount(); j++) + Add(arr[j]); } // Add paths e.g. from the PATH environment variable -void wxPathList::AddEnvList (const wxString& envVariable) +void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(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__ + + // 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"; this is true for both Windows and Unix. + + static const wxChar PATH_TOKS[] = +#if defined(__WINDOWS__) || defined(__OS2__) + wxT(";"); // Don't separate with colon in DOS (used for drive) #else - wxT(" :;"); + wxT(":;"); #endif - wxChar *val = wxGetenv (WXSTRINGCAST envVariable); - if (val && *val) + wxString val; + if ( wxGetEnv(envVariable, &val) ) { - wxChar *s = copystring (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)); - } - } - - // suppress warning about unused variable save_ptr when wxStrtok() is a - // macro which throws away its third argument - save_ptr = token; - - delete [] s; + // split into an array of string the value of the env var + wxArrayString arr = wxStringTokenize(val, PATH_TOKS); + WX_APPEND_ARRAY(*this, arr); } +#endif // !__WXWINCE__ } // Given a full filename (with path), ensure that that file can // be accessed again USING FILENAME ONLY by adding the path // to the list if not already there. -void wxPathList::EnsureFileAccessible (const wxString& path) +bool wxPathList::EnsureFileAccessible (const wxString& path) { - wxString path_only(wxPathOnly(path)); - if ( !path_only.IsEmpty() ) - { - if ( !Member(path_only) ) - Add(path_only); - } + return Add(wxPathOnly(path)); } -bool wxPathList::Member (const wxString& path) +#if WXWIN_COMPATIBILITY_2_6 +bool wxPathList::Member (const wxString& path) const { - for (wxNode * node = First (); node != NULL; node = node->Next ()) - { - wxString path2((wxChar *) node->Data ()); - if ( -#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__) - // Case INDEPENDENT - path.CompareTo (path2, wxString::ignoreCase) == 0 -#else - // Case sensitive File System - path.CompareTo (path2) == 0 -#endif - ) - return TRUE; - } - return FALSE; + return Index(path) != wxNOT_FOUND; } +#endif -wxString wxPathList::FindValidPath (const wxString& file) +wxString wxPathList::FindValidPath (const wxString& file) const { - if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file))) - return wxString(wxFileFunctionsBuffer); - - wxChar buf[_MAXPATHLEN]; - wxStrcpy(buf, wxFileFunctionsBuffer); - - wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */ - filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf; + // normalize the given string as it could be a path + a filename + // and not only a filename + wxFileName fn(file); + wxString strend; + + // NB: normalize without making absolute otherwise calling this function with + // e.g. "b/c.txt" would result in removing the directory 'b' and the for loop + // below would only add to the paths of this list the 'c.txt' part when doing + // the existence checks... + // NB: we don't use wxPATH_NORM_DOTS here, too (see wxPathList::Add for more info) + if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS)) + return wxEmptyString; + + wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files")); + if (fn.IsAbsolute()) + strend = fn.GetFullName(); // search for the file name and ignore the path part + else + strend = fn.GetFullPath(); - for (wxNode * node = First (); node; node = node->Next ()) + for (size_t i=0; iData (); - wxStrcpy (wxFileFunctionsBuffer, path); - wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1]; - if (ch != wxT('\\') && ch != wxT('/')) - wxStrcat (wxFileFunctionsBuffer, wxT("/")); - wxStrcat (wxFileFunctionsBuffer, filename); -#ifdef __WINDOWS__ - Unix2DosFilename (wxFileFunctionsBuffer); -#endif - if (wxFileExists (wxFileFunctionsBuffer)) - { - return wxString(wxFileFunctionsBuffer); // Found! - } - } // for() + wxString strstart = Item(i); + if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator()) + strstart += wxFileName::GetPathSeparator(); + + if (wxFileExists(strstart + strend)) + return strstart + strend; // Found! + } - return wxString(wxT("")); // Not found + return wxEmptyString; // Not found } -wxString wxPathList::FindAbsoluteValidPath (const wxString& file) +wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const { wxString f = FindValidPath(file); - if ( wxIsAbsolutePath(f) ) + if ( f.empty() || wxIsAbsolutePath(f) ) return f; - wxString buf; - wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1); - buf.UngetWriteBuf(); + wxString buf = ::wxGetCwd(); + if ( !wxEndsWithPathSeparator(buf) ) { buf += wxFILE_SEP_PATH; @@ -269,103 +285,95 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) return buf; } -bool -wxFileExists (const wxString& filename) +// ---------------------------------------------------------------------------- +// miscellaneous global functions +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_8 +static inline wxChar* MYcopystring(const wxString& s) { -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) - // GetFileAttributes can copy with network paths - DWORD ret = GetFileAttributes(filename); - DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY); - return ((ret != 0xffffffff) && (isDir == 0)); -#else - wxStructStat stbuf; - if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 ) - return TRUE; + wxChar* copy = new wxChar[s.length() + 1]; + return wxStrcpy(copy, s.c_str()); +} - return FALSE; +template +static inline CharType* MYcopystring(const CharType* s) +{ + CharType* copy = new CharType[wxStrlen(s) + 1]; + return wxStrcpy(copy, s); +} #endif + + +bool +wxFileExists (const wxString& filename) +{ + return wxFileName::FileExists(filename); } bool wxIsAbsolutePath (const wxString& filename) { - if (filename != wxT("")) + if (!filename.empty()) { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // Classic or Carbon CodeWarrior like - // Carbon with Apple DevTools is Unix like - - // 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 ; -#else // Unix like or Windows if (filename[0] == wxT('/')) - return TRUE; -#endif + return true; #ifdef __VMS__ if ((filename[0] == wxT('[') && filename[1] != wxT('.'))) - return TRUE; + return true; #endif -#ifdef __WINDOWS__ +#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 ; } +#if WXWIN_COMPATIBILITY_2_8 /* * Strip off any extension (dot something) from end of file, * IF one exists. Inserts zero into buffer. * */ -void wxStripExtension(wxChar *buffer) +template +static void wxDoStripExtension(T *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(char *buffer) { wxDoStripExtension(buffer); } +void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); } + void wxStripExtension(wxString& buffer) { - size_t len = buffer.Length(); - size_t i = len-1; - while (i > 0) - { - if (buffer.GetChar(i) == wxT('.')) - { - buffer = buffer.Left(i); - break; - } - i --; - } + buffer = wxFileName::StripExtension(buffer); } // Destructive removal of /./ and /../ stuff -wxChar *wxRealPath (wxChar *path) +template +static CharType *wxDoRealPath (CharType *path) { -#ifdef __WXMSW__ - static const wxChar SEP = wxT('\\'); - Unix2DosFilename(path); -#else - static const wxChar SEP = wxT('/'); + static const CharType SEP = wxFILE_SEP_PATH; +#ifdef __WINDOWS__ + wxUnix2DosFilename(path); #endif if (path[0] && path[1]) { /* MATTHEW: special case "/./x" */ - wxChar *p; + CharType *p; if (path[2] == SEP && path[1] == wxT('.')) p = &path[0]; else @@ -376,8 +384,12 @@ wxChar *wxRealPath (wxChar *path) { 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--); + CharType *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)) { @@ -387,7 +399,7 @@ wxChar *wxRealPath (wxChar *path) path[0] = SEP; path[1] = wxT('\0'); } -#ifdef __WXMSW__ +#if defined(__WINDOWS__) || defined(__OS2__) /* Check that path[2] is NULL! */ else if (path[1] == wxT(':') && !path[2]) { @@ -406,28 +418,48 @@ wxChar *wxRealPath (wxChar *path) return path; } +char *wxRealPath(char *path) +{ + return wxDoRealPath(path); +} + +wchar_t *wxRealPath(wchar_t *path) +{ + return wxDoRealPath(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 == wxT("")) - return (wxChar *) NULL; + if (filename.empty()) + return NULL; - if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) { - wxChar buf[_MAXPATHLEN]; - buf[0] = wxT('\0'); - wxGetWorkingDirectory(buf, WXSIZEOF(buf)); - wxChar ch = buf[wxStrlen(buf) - 1]; -#ifdef __WXMSW__ - if (ch != wxT('\\') && ch != wxT('/')) - wxStrcat(buf, wxT("\\")); + if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) + { + wxString buf = ::wxGetCwd(); + wxChar ch = buf.Last(); +#ifdef __WINDOWS__ + if (ch != wxT('\\') && ch != wxT('/')) + buf << wxT("\\"); #else - if (ch != wxT('/')) - wxStrcat(buf, wxT("/")); + if (ch != wxT('/')) + buf << wxT("/"); #endif - wxStrcat(buf, wxFileFunctionsBuffer); - return copystring( wxRealPath(buf) ); - } - return copystring( wxFileFunctionsBuffer ); + buf << wxFileFunctionsBuffer; + buf = wxRealPath( buf ); + return MYcopystring( buf ); + } + return MYcopystring( wxFileFunctionsBuffer ); } /*- @@ -453,43 +485,44 @@ wxChar *wxCopyAbsolutePath(const wxString& filename) /* input name in name, pathname output to buf. */ -wxChar *wxExpandPath(wxChar *buf, const wxChar *name) +template +static CharType *wxDoExpandPath(CharType *buf, const wxString& name) { - register wxChar *d, *s, *nm; - wxChar lnm[_MAXPATHLEN]; + register CharType *d, *s, *nm; + CharType lnm[_MAXPATHLEN]; int q; // Some compilers don't like this line. -// const wxChar trimchars[] = wxT("\n \t"); +// const CharType trimchars[] = wxT("\n \t"); - wxChar trimchars[4]; + CharType trimchars[4]; trimchars[0] = wxT('\n'); trimchars[1] = wxT(' '); trimchars[2] = wxT('\t'); trimchars[3] = 0; -#ifdef __WXMSW__ - const wxChar SEP = wxT('\\'); -#else - const wxChar SEP = wxT('/'); + static const CharType SEP = wxFILE_SEP_PATH; +#ifdef __WINDOWS__ + //wxUnix2DosFilename(path); #endif + buf[0] = wxT('\0'); - if (name == NULL || *name == wxT('\0')) + if (name.empty()) return buf; - nm = copystring(name); // Make a scratch copy - wxChar *nm_tmp = nm; + nm = ::MYcopystring(static_cast(name.c_str())); // Make a scratch copy + CharType *nm_tmp = nm; /* Skip leading whitespace and cr */ - while (wxStrchr((wxChar *)trimchars, *nm) != NULL) + while (wxStrchr(trimchars, *nm) != NULL) nm++; /* And strip off trailing whitespace and cr */ s = nm + (q = wxStrlen(nm)) - 1; - while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL) + while (q-- && wxStrchr(trimchars, *s) != NULL) *s = wxT('\0'); s = nm; d = lnm; -#ifdef __WXMSW__ +#ifdef __WINDOWS__ q = FALSE; #else q = nm[0] == wxT('\\') && nm[1] == wxT('~'); @@ -514,9 +547,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) else #else while ((*d++ = *s) != 0) { -# ifndef __WXMSW__ +# ifndef __WINDOWS__ if (*s == wxT('\\')) { - if ((*(d - 1) = *++s)) { + if ((*(d - 1) = *++s)!=0) { s++; continue; } else @@ -524,15 +557,17 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) } else # endif #endif -#ifdef __WXMSW__ + // No env variables on WinCE +#ifndef __WXWINCE__ +#ifdef __WINDOWS__ if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')'))) #else if (*s++ == wxT('$')) #endif { - register wxChar *start = d; + register CharType *start = d; register int braces = (*s == wxT('{') || *s == wxT('(')); - register wxChar *value; + register CharType *value; while ((*d++ = *s) != 0) if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) ) break; @@ -541,44 +576,56 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *--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 */ + wxString homepath; nm = lnm; - s = wxT(""); if (nm[0] == wxT('~') && !q) { /* prefix ~ */ if (nm[1] == SEP || nm[1] == 0) { /* ~/filename */ - // FIXME: wxGetUserHome could return temporary storage in Unicode mode - if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) { + homepath = wxGetUserHome(wxEmptyString); + if (!homepath.empty()) { + s = (CharType*)(const CharType*)homepath.c_str(); if (*++nm) nm++; } } else { /* ~user/filename */ - register wxChar *nnm; - register wxChar *home; - for (s = nm; *s && *s != SEP; s++); + register CharType *nnm; + 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; *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; - s = wxT(""); - } else { + homepath = wxGetUserHome(wxString(nm + 1)); + if (homepath.empty()) + { + if (was_sep) /* replace only if it was there: */ + *s = SEP; + s = NULL; + } + else + { nm = nnm; - s = home; + s = (CharType*)(const CharType*)homepath.c_str(); } } } @@ -593,12 +640,26 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *(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); } +char *wxExpandPath(char *buf, const wxString& name) +{ + return wxDoExpandPath(buf, name); +} + +wchar_t *wxExpandPath(wchar_t *buf, const wxString& name) +{ + return wxDoExpandPath(buf, name); +} + + /* Contract Paths to be build upon an environment variable component: @@ -607,122 +668,71 @@ 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]; - if (filename == wxT("")) - return (wxChar *) NULL; + if (filename.empty()) + return NULL; - wxStrcpy (dest, WXSTRINGCAST filename); -#ifdef __WXMSW__ - Unix2DosFilename(dest); + wxStrcpy (dest, filename); +#ifdef __WINDOWS__ + wxUnix2DosFilename(dest); #endif // Handle environment - const wxChar *val = (const wxChar *) NULL; - wxChar *tcp = (wxChar *) NULL; - if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL && + wxString val; +#ifndef __WXWINCE__ + wxChar *tcp; + if (!envname.empty() && !(val = wxGetenv (envname)).empty() && (tcp = wxStrstr (dest, val)) != NULL) { - wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val)); + wxStrcpy (wxFileFunctionsBuffer, tcp + val.length()); *tcp++ = wxT('$'); *tcp++ = wxT('{'); - wxStrcpy (tcp, WXSTRINGCAST envname); + wxStrcpy (tcp, envname); wxStrcat (tcp, wxT("}")); wxStrcat (tcp, wxFileFunctionsBuffer); } +#endif // Handle User's home (ignore root homes!) - size_t len = 0; - if ((val = wxGetUserHome (user)) != NULL && - (len = wxStrlen(val)) > 2 && - wxStrncmp(dest, val, len) == 0) - { - wxStrcpy(wxFileFunctionsBuffer, wxT("~")); - if (user != wxT("")) - wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user); -#ifdef __WXMSW__ -// strcat(wxFileFunctionsBuffer, "\\"); -#else -// strcat(wxFileFunctionsBuffer, "/"); -#endif - wxStrcat(wxFileFunctionsBuffer, dest + len); - wxStrcpy (dest, wxFileFunctionsBuffer); - } + val = wxGetUserHome (user); + if (val.empty()) + return dest; + + const size_t len = val.length(); + if (len <= 2) + return dest; + + if (wxStrncmp(dest, val, len) == 0) + { + wxStrcpy(wxFileFunctionsBuffer, wxT("~")); + if (!user.empty()) + wxStrcat(wxFileFunctionsBuffer, user); + wxStrcat(wxFileFunctionsBuffer, dest + len); + wxStrcpy (dest, wxFileFunctionsBuffer); + } return dest; } -// Return just the filename, not the path -// (basename) +#endif // #if WXWIN_COMPATIBILITY_2_8 + +// Return just the filename, not the path (basename) wxChar *wxFileNameFromPath (wxChar *path) { - if (path) - { - register wxChar *tcp; - - tcp = path + wxStrlen (path); - while (--tcp >= path) - { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // Classic or Carbon CodeWarrior like - // Carbon with Apple DevTools is Unix like - if (*tcp == wxT(':')) - return tcp + 1; -#else - // Unix like or Windows - if (*tcp == wxT('/') || *tcp == wxT('\\')) - return tcp + 1; -#endif -#ifdef __VMS__ - if (*tcp == wxT(':') || *tcp == wxT(']')) - return tcp + 1; -#endif - } /* while */ -#if defined(__WXMSW__) || defined(__WXPM__) - // MSDOS like - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) - return path + 2; -#endif - } - return path; + wxString p = path; + wxString n = wxFileNameFromPath(p); + + return path + p.length() - n.length(); } -wxString wxFileNameFromPath (const wxString& path1) +wxString wxFileNameFromPath (const wxString& path) { - if (path1 != wxT("")) - { - wxChar *path = WXSTRINGCAST path1 ; - register wxChar *tcp; - - tcp = path + wxStrlen (path); - while (--tcp >= path) - { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // Classic or Carbon CodeWarrior like - // Carbon with Apple DevTools is Unix like - if (*tcp == wxT(':') ) - return wxString(tcp + 1); -#else - // Unix like or Windows - if (*tcp == wxT('/') || *tcp == wxT('\\')) - return wxString(tcp + 1); -#endif -#ifdef __VMS__ - if (*tcp == wxT(':') || *tcp == wxT(']')) - return wxString(tcp + 1); -#endif - } /* while */ -#if defined(__WXMSW__) || defined(__WXPM__) - // MSDOS like - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) - return wxString(path + 2); -#endif - } - // Yes, this should return the path, not an empty string, otherwise - // we get "thing.txt" -> "". - return path1; + return wxFileName(path).GetFullName(); } // Return just the directory, or NULL if no directory @@ -732,32 +742,22 @@ wxPathOnly (wxChar *path) if (path && *path) { static wxChar buf[_MAXPATHLEN]; - + // Local copy wxStrcpy (buf, path); - + int l = wxStrlen(path); int i = l - 1; - + // Search backward for a backward or forward slash while (i > -1) { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // Classic or Carbon CodeWarrior like - // Carbon with Apple DevTools is Unix like - if (path[i] == wxT(':') ) - { - buf[i] = 0; - return buf; - } -#else // Unix like or Windows if (path[i] == wxT('/') || path[i] == wxT('\\')) { buf[i] = 0; return buf; } -#endif #ifdef __VMS__ if (path[i] == wxT(']')) { @@ -767,8 +767,8 @@ wxPathOnly (wxChar *path) #endif i --; } - -#if defined(__WXMSW__) || defined(__WXPM__) + +#if defined(__WINDOWS__) || defined(__OS2__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -779,41 +779,34 @@ wxPathOnly (wxChar *path) } #endif } - return (wxChar *) NULL; + return NULL; } // Return just the directory, or NULL if no directory wxString wxPathOnly (const wxString& path) { - if (path != wxT("")) + if (!path.empty()) { wxChar buf[_MAXPATHLEN]; - + // Local copy - wxStrcpy (buf, WXSTRINGCAST path); - - int l = path.Length(); + wxStrcpy(buf, path); + + int l = path.length(); int i = l - 1; // Search backward for a backward or forward slash while (i > -1) { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // Classic or Carbon CodeWarrior like - // Carbon with Apple DevTools is Unix like - if (path[i] == wxT(':') ) - { - buf[i] = 0; - return wxString(buf); - } -#else // 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 #ifdef __VMS__ if (path[i] == wxT(']')) { @@ -823,8 +816,8 @@ wxString wxPathOnly (const wxString& path) #endif i --; } - -#if defined(__WXMSW__) || defined(__WXPM__) + +#if defined(__WINDOWS__) || defined(__OS2__) // Try Drive specifier if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { @@ -835,172 +828,121 @@ wxString wxPathOnly (const wxString& path) } #endif } - return wxString(wxT("")); + return wxEmptyString; } // Utility for converting delimiters in DOS filenames to UNIX style // and back again - or we get nasty problems with delimiters. // Also, convert to lower case, since case is significant in UNIX. -#if defined(__WXMAC__) -wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) -{ -#ifdef __DARWIN__ - FSRef theRef; - char thePath[FILENAME_MAX]; - - // convert the FSSpec to an FSRef - (void) FSpMakeFSRef( spec, &theRef ); - // get the POSIX path associated with the FSRef - (void) FSRefMakePath( &theRef, (UInt8 *)thePath, sizeof(thePath) ); - - // create path string for return value - wxString result( thePath ) ; -#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( (char*) *myPath ) ; - - // free allocated handle - ::HUnlock( myPath ) ; - ::DisposeHandle( myPath ) ; -#endif +#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) - return result ; -} +#define kDefaultPathStyle kCFURLPOSIXPathStyle -void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) +wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent ) { -#ifdef __DARWIN__ - FSRef theRef; + CFURLRef fullURLRef; + fullURLRef = CFURLCreateFromFSRef(NULL, fsRef); + if ( fullURLRef == NULL) + return wxEmptyString; + + if ( additionalPathComponent ) + { + CFURLRef parentURLRef = fullURLRef ; + fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef, + additionalPathComponent,false); + CFRelease( parentURLRef ) ; + } + wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle )); + CFRelease( fullURLRef ) ; - // get the FSRef associated with the POSIX path - (void) FSPathMakeRef((const UInt8 *) path, &theRef, NULL); - // convert the FSRef to an FSSpec - (void) FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL); -#else - FSpLocationFromFullPath( strlen(path) , path , spec ) ; -#endif + return wxCFStringRef::AsStringWithNormalizationFormC(cfString); } -#ifndef __DARWIN__ -// Mac file names are POSIX (Unix style) under Darwin -// therefore the conversion functions below are not needed - -static char sMacFileNameConversion[ 1000 ] ; - -wxString wxMac2UnixFilename (const char *str) +OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) { - char *s = sMacFileNameConversion ; - strcpy( s , str ) ; - if (s) + OSStatus err = noErr ; + CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path)); + CFStringNormalize(cfMutableString,kCFStringNormalizationFormD); + CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false); + CFRelease( cfMutableString ); + if ( NULL != url ) { - memmove( s+1 , s ,strlen( s ) + 1) ; - if ( *s == ':' ) - *s = '.' ; - else - *s = '/' ; - - while (*s) - { - if (*s == ':') - *s = '/'; - else - *s = wxTolower(*s); // Case INDEPENDENT - s++; - } + if ( CFURLGetFSRef(url, fsRef) == false ) + err = fnfErr ; + CFRelease( url ) ; + } + else + { + err = fnfErr ; } - return wxString(sMacFileNameConversion) ; + return err ; } -wxString wxUnix2MacFilename (const char *str) +wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) { - char *s = sMacFileNameConversion ; - strcpy( 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 ) ) ; - } - else if ( *s == '/' ) - { - // absolute path -> on mac just start with the drive name - memmove( s , s+1 ,strlen( s ) ) ; - } - else - { - wxASSERT_MSG( 1 , "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 ,strlen( s+3 ) + 1 ) ; - } - else - *s = ':'; - } - s++ ; - } - } - return wxString (sMacFileNameConversion) ; + wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault, + uniname->unicode, + uniname->length ) ); + return wxCFStringRef::AsStringWithNormalizationFormC(cfname); } -wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) +#ifndef __LP64__ + +wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) { - return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; + FSRef fsRef ; + if ( FSpMakeFSRef( spec , &fsRef) == noErr ) + { + return wxMacFSRefToPath( &fsRef ) ; + } + return wxEmptyString ; } -void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) +void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec ) { - wxString var = wxUnix2MacFilename( path ) ; - wxMacFilename2FSSpec( var , spec ) ; + OSStatus err = noErr; + FSRef fsRef; + wxMacPathToFSRef( path , &fsRef ); + err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL); + verify_noerr( err ); } -#endif // ! __DARWIN__ +#endif #endif // __WXMAC__ -void -wxDos2UnixFilename (char *s) + +#if WXWIN_COMPATIBILITY_2_8 + +template +static void wxDoDos2UnixFilename(T *s) { if (s) while (*s) { - if (*s == '\\') - *s = '/'; -#ifdef __WXMSW__ + if (*s == wxT('\\')) + *s = wxT('/'); +#ifdef __WINDOWS__ else - *s = wxTolower (*s); // Case INDEPENDENT + *s = wxTolower(*s); // Case INDEPENDENT #endif s++; } } -void -#if defined(__WXMSW__) || defined(__WXPM__) -wxUnix2DosFilename (wxChar *s) +void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); } +void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); } + +template +static void +#if defined(__WINDOWS__) || defined(__OS2__) +wxDoUnix2DosFilename(T *s) #else -wxUnix2DosFilename (wxChar *WXUNUSED(s) ) +wxDoUnix2DosFilename(T *WXUNUSED(s) ) #endif { // Yes, I really mean this to happen under DOS only! JACS -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WINDOWS__) || defined(__OS2__) if (s) while (*s) { @@ -1011,45 +953,93 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) ) #endif } +void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); } +void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); } + +#endif // #if WXWIN_COMPATIBILITY_2_8 + // Concatenate two files to form third bool wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) { - 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 - 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 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(); + +#else - while ((ch = getc (fp2)) != EOF) - (void) putc (ch, fp3); - fclose (fp2); + wxUnusedVar(file1); + wxUnusedVar(file2); + wxUnusedVar(file3); + return false; - fclose (fp3); - bool result = wxRenameFile(outfile, file3); - return result; +#endif } +// helper of generic implementation of wxCopyFile() +#if !(defined(__WIN32__) || defined(__OS2__)) && wxUSE_FILE + +static bool +wxDoCopyFile(wxFile& fileIn, + const wxStructStat& fbuf, + const wxString& filenameDst, + bool overwrite) +{ + // reset the umask as we want to create the file with exactly the same + // permissions as the original one + wxCHANGE_UMASK(0); + + // create file2 with the same permissions than file1 and open it for + // writing + + wxFile fileOut; + if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) ) + return false; + + // copy contents of file1 to file2 + char buf[4096]; + for ( ;; ) + { + ssize_t count = fileIn.Read(buf, WXSIZEOF(buf)); + if ( count == wxInvalidOffset ) + return false; + + // end of file? + if ( !count ) + break; + + if ( fileOut.Write(buf, count) < (size_t)count ) + 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 + return fileIn.Close() && fileOut.Close(); +} + +#endif // generic implementation of wxCopyFile + // Copy files bool wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) @@ -1059,29 +1049,33 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) // 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; + if ( !::CopyFile(file1.t_str(), file2.t_str(), !overwrite) ) + { + wxLogSysError(_("Failed to copy the file '%s' to '%s'"), + file1.c_str(), file2.c_str()); + return false; + } +#elif defined(__OS2__) + if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 ) + return false; +#elif wxUSE_FILE // !Win32 + + wxStructStat fbuf; // get permissions of file1 - if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 ) + if ( wxStat( file1, &fbuf) != 0 ) { // 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; + 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 @@ -1089,78 +1083,105 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) { 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__ + wxDoCopyFile(fileIn, fbuf, file2, overwrite); - // 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__ +#if defined(__WXMAC__) || defined(__WXCOCOA__) + // copy the resource fork of the file too if it's present + wxString pathRsrcOut; + wxFile fileRsrcIn; - // copy contents of file1 to file2 - char buf[4096]; - size_t count; - for ( ;; ) { - count = fileIn.Read(buf, WXSIZEOF(buf)); - if ( fileIn.Error() ) - return FALSE; + // suppress error messages from this block as resource forks don't have + // to exist + wxLogNull noLog; + + // it's not enough to check for file existence: it always does on HFS + // but is empty for files without resources + if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) && + fileRsrcIn.Length() > 0 ) + { + // we must be using HFS or another filesystem with resource fork + // support, suppose that destination file system also is HFS[-like] + pathRsrcOut = file2 + wxT("/..namedfork/rsrc"); + } + else // check if we have resource fork in separate file (non-HFS case) + { + wxFileName fnRsrc(file1); + fnRsrc.SetName(wxT("._") + fnRsrc.GetName()); - // end of file? - if ( !count ) - break; + fileRsrcIn.Close(); + if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) ) + { + fnRsrc = file2; + fnRsrc.SetName(wxT("._") + fnRsrc.GetName()); - if ( fileOut.Write(buf, count) < count ) - return FALSE; + pathRsrcOut = fnRsrc.GetFullPath(); + } + } } - // 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; + if ( !pathRsrcOut.empty() ) + { + if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) ) + return false; + } +#endif // wxMac || wxCocoa #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 ) + if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 ) { wxLogSysError(_("Impossible to set permissions for the file '%s'"), file2.c_str()); - return FALSE; + return false; } #endif // OS/2 || Mac - return TRUE; -#endif // __WXMSW__ && __WIN32__ +#else // !Win32 && ! wxUSE_FILE + + // impossible to simulate with wxWidgets API + wxUnusedVar(file1); + wxUnusedVar(file2); + wxUnusedVar(overwrite); + return false; + +#endif // __WINDOWS__ && __WIN32__ + + return true; } bool -wxRenameFile (const wxString& file1, const wxString& file2) +wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite) { - // Normal system call + 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__) + // Normal system call if ( wxRename (file1, file2) == 0 ) - return TRUE; + return true; +#endif // Try to copy - if (wxCopyFile(file1, file2)) { + if (wxCopyFile(file1, file2, overwrite)) { wxRemoveFile(file1); - return TRUE; + return true; } // Give up - return FALSE; + wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2); + return false; } bool wxRemoveFile(const wxString& file) @@ -1168,767 +1189,731 @@ bool wxRemoveFile(const wxString& file) #if defined(__VISUALC__) \ || defined(__BORLANDC__) \ || defined(__WATCOMC__) \ + || defined(__DMC__) \ || defined(__GNUWIN32__) - int res = wxRemove(file); + int res = wxRemove(file); +#elif defined(__WXMAC__) + int res = unlink(file.fn_str()); #else - int res = unlink(OS_FILENAME(file)); + int res = unlink(file.fn_str()); #endif - - return res == 0; + if ( res ) + { + wxLogSysError(_("File '%s' couldn't be removed"), file); + } + return res == 0; } bool wxMkdir(const wxString& dir, int perm) { #if defined(__WXMAC__) && !defined(__UNIX__) - return (mkdir( dir , 0 ) == 0); -#else // !Mac - const wxChar *dirname = dir.c_str(); + if ( mkdir(dir.fn_str(), 0) != 0 ) // 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__) || defined(__WXMICROWIN__) +#elif (!(defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__))) || \ + (defined(__GNUWIN32__) && !defined(__MINGW32__)) || \ + defined(__WINE__) || defined(__WXMICROWIN__) + const wxChar *dirname = dir.c_str(); + #if defined(MSVCRT) + wxUnusedVar(perm); + if ( mkdir(wxFNCONV(dirname)) != 0 ) + #else if ( mkdir(wxFNCONV(dirname), perm) != 0 ) -#elif defined(__WXPM__) - if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? -#else // !MSW and !OS/2 VAC++ + #endif +#elif defined(__OS2__) + wxUnusedVar(perm); + if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's?? +#elif defined(__DOS__) + const wxChar *dirname = dir.c_str(); + #if defined(__WATCOMC__) (void)perm; if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) + #elif defined(__DJGPP__) + if ( mkdir(wxFNCONV(dirname), perm) != 0 ) + #else + #error "Unsupported DOS compiler!" + #endif +#else // !MSW, !DOS and !OS/2 VAC++ + wxUnusedVar(perm); + #ifdef __WXWINCE__ + if ( CreateDirectory(dir.fn_str(), NULL) == 0 ) + #else + if ( wxMkDir(dir.fn_str()) != 0 ) + #endif #endif // !MSW/MSW { - wxLogSysError(_("Directory '%s' couldn't be created"), dirname); - - return FALSE; + wxLogSysError(_("Directory '%s' couldn't be created"), dir); + return false; } - return TRUE; -#endif // Mac/!Mac + return true; } 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); +#if defined(__VMS__) + return false; //to be changed since rmdir exists in VMS7.x #else + #if defined(__OS2__) + if ( ::DosDeleteDir(dir.c_str()) != 0 ) + #elif defined(__WXWINCE__) + if ( RemoveDirectory(dir.fn_str()) == 0 ) + #else + if ( wxRmDir(dir.fn_str()) != 0 ) + #endif + { + wxLogSysError(_("Directory '%s' couldn't be deleted"), dir); + return false; + } -#ifdef __SALFORDC__ - return FALSE; // What to do? -#else - return (wxRmDir(OS_FILENAME(dir)) == 0); -#endif - + return true; #endif } // does the path exists? (may have or not '/' or '\\' at the end) -bool wxPathExists(const wxChar *pszPathName) +bool wxDirExists(const wxString& pathName) { - 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; - - strPath.Truncate(len - 1); - } -#endif // __WINDOWS__ - -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) - // 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 - - wxStructStat st; -#ifndef __VISAGECPP__ - return wxStat(wxFNSTRINGCAST strPath.fn_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(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && - (st.st_mode == S_IFDIR); -#endif - -#endif + return wxFileName::DirExists(pathName); } +#if WXWIN_COMPATIBILITY_2_8 + // Get a temporary filename, opening and closing the file. wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) { - wxString filename = wxFileName::CreateTempFileName(prefix); - if ( filename.empty() ) + wxString filename; + if ( !wxGetTempFileName(prefix, filename) ) return NULL; if ( buf ) wxStrcpy(buf, filename); else - buf = copystring(filename); + buf = MYcopystring(filename); return buf; } bool wxGetTempFileName(const wxString& prefix, wxString& buf) { +#if wxUSE_FILE buf = wxFileName::CreateTempFileName(prefix); return !buf.empty(); -} +#else // !wxUSE_FILE + wxUnusedVar(prefix); + wxUnusedVar(buf); -// Get first file name matching given wild card. + return false; +#endif // wxUSE_FILE/!wxUSE_FILE +} -#if defined(__UNIX__) +#endif // #if WXWIN_COMPATIBILITY_2_8 // Get first file name matching given wild card. -// Flags are reserved for future use. -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - static DIR *gs_dirStream = (DIR *) NULL; - static wxString gs_strFileSpec; - static int gs_findFlags = 0; -#endif +static wxDir *gs_dir = NULL; +static wxString gs_dirPath; -wxString wxFindFirstFile(const wxChar *spec, int flags) +wxString wxFindFirstFile(const wxString& spec, int flags) { - wxString result; -#ifdef __VMS - wxChar *specvms = NULL; -#endif - -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - if (gs_dirStream) - closedir(gs_dirStream); // edz 941103: better housekeping - - gs_findFlags = flags; + wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL); + if ( gs_dirPath.empty() ) + gs_dirPath = wxT("."); + if ( !wxEndsWithPathSeparator(gs_dirPath ) ) + gs_dirPath << wxFILE_SEP_PATH; - gs_strFileSpec = spec; + delete gs_dir; // can be NULL, this is ok + gs_dir = new wxDir(gs_dirPath); - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - - // special case: path is really "/" - if ( !path && gs_strFileSpec[0u] == wxT('/') ) -#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 ) -#ifdef __VMS - { - wxStrcpy( specvms , wxT( "[]" ) ); - gs_strFileSpec = specvms; - wxString path_vms1(wxPathOnly(gs_strFileSpec)); - path = path_vms1; - } -#else - path = wxT('.'); -#endif + if ( !gs_dir->IsOpened() ) + { + wxLogSysError(_("Cannot enumerate files '%s'"), spec); + return wxEmptyString; + } - gs_dirStream = opendir(path.fn_str()); - if ( !gs_dirStream ) + int dirFlags; + switch (flags) { - wxLogSysError(_("Can not enumerate files in directory '%s'"), - path.c_str()); + case wxDIR: dirFlags = wxDIR_DIRS; break; + case wxFILE: dirFlags = wxDIR_FILES; break; + default: dirFlags = wxDIR_DIRS | wxDIR_FILES; break; } - else + + wxString result; + gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags); + if ( result.empty() ) { - result = wxFindNextFile(); + wxDELETE(gs_dir); + return result; } -#endif // !VMS6.x or earlier - return result; + return gs_dirPath + result; } wxString wxFindNextFile() { + wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" ); + wxString result; + if ( !gs_dir->GetNext(&result) || result.empty() ) + { + wxDELETE(gs_dir); + return result; + } -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") ); + return gs_dirPath + result; +} - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - wxString name(wxFileNameFromPath(gs_strFileSpec)); - /* MATTHEW: special case: path is really "/" */ - if ( !path && gs_strFileSpec[0u] == wxT('/')) - path = wxT('/'); +// Get current working directory. +// 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! - // Do the reading - struct dirent *nextDir; - for ( nextDir = readdir(gs_dirStream); - nextDir != NULL; - nextDir = readdir(gs_dirStream) ) +wxChar *wxDoGetCwd(wxChar *buf, int sz) +{ +#if defined(__WXWINCE__) + // TODO + if(buf && sz>0) buf[0] = wxT('\0'); + return buf; +#else + if ( !buf ) { - 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() ) - { - result = path; - if ( path != wxT('/') ) - result += wxT('/'); - } + buf = new wxChar[sz + 1]; + } - result += nextDir->d_name; + bool ok wxDUMMY_INITIALIZE(false); - // Only return "." and ".." when they match - bool isdir; - if ( (strcmp(nextDir->d_name, ".") == 0) || - (strcmp(nextDir->d_name, "..") == 0)) - { - if ( (gs_findFlags & wxDIR) != 0 ) - isdir = TRUE; - else - continue; - } - else - isdir = wxDirExists(result); + // 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; - // and only return directories when flags & wxDIR - if ( !gs_findFlags || - ((gs_findFlags & wxDIR) && isdir) || - ((gs_findFlags & wxFILE) && !isdir) ) + #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU + char cbuf[_MAXPATHLEN]; + #endif + + #ifdef HAVE_WGETCWD + #if wxUSE_UNICODE_MSLU + if ( wxGetOsVersion() != wxOS_WINDOWS_9X ) + #else + char *cbuf = NULL; // never really used because needsANSI will always be false + #endif { - return result; + ok = _wgetcwd(buf, sz) != NULL; + needsANSI = false; } + #endif + + if ( needsANSI ) +#endif // wxUSE_UNICODE + { + #if defined(_MSC_VER) || defined(__MINGW32__) + ok = _getcwd(cbuf, sz) != NULL; + #elif defined(__OS2__) + APIRET rc; + ULONG ulDriveNum = 0; + ULONG ulDriveMap = 0; + rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap); + ok = rc == 0; + if (ok) + { + sz -= 3; + rc = ::DosQueryCurrentDir( 0 // current drive + ,(PBYTE)cbuf + 3 + ,(PULONG)&sz + ); + cbuf[0] = char('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 + // finally convert the result to Unicode if needed + wxConvFile.MB2WC(buf, cbuf, sz); + #endif // wxUSE_UNICODE } - result.Empty(); // not found - - closedir(gs_dirStream); - gs_dirStream = (DIR *) NULL; -#endif // !VMS6.2 or earlier + if ( !ok ) + { + wxLogSysError(_("Failed to get the working directory")); - return result; -} + // VZ: the old code used to return "." on error which didn't make any + // sense at all to me - empty string is a better error indicator + // (NULL might be even better but I'm afraid this could lead to + // problems with the old code assuming the return is never NULL) + buf[0] = wxT('\0'); + } + else // ok, but we might need to massage the path into the right format + { +#ifdef __DJGPP__ + // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths + // with / deliminers. We don't like that. + for (wxChar *ch = buf; *ch; ch++) + { + if (*ch == wxT('/')) + *ch = wxT('\\'); + } +#endif // __DJGPP__ -#elif defined(__WXMAC__) +// MBN: we hope that in the case the user is compiling a GTK+/Motif app, +// he needs Unix as opposed to Win32 pathnames +#if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) + // another example of DOS/Unix mix (Cygwin) + wxString pathUnix = buf; +#if wxUSE_UNICODE + #if CYGWIN_VERSION_DLL_MAJOR >= 1007 + cygwin_conv_path(CCP_POSIX_TO_WIN_W, pathUnix.mb_str(wxConvFile), buf, sz); + #else + char bufA[_MAXPATHLEN]; + cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA); + wxConvFile.MB2WC(buf, bufA, sz); + #endif +#else + #if CYGWIN_VERSION_DLL_MAJOR >= 1007 + cygwin_conv_path(CCP_POSIX_TO_WIN_A, pathUnix, buf, sz); + #else + cygwin_conv_to_full_win32_path(pathUnix, buf); + #endif +#endif // wxUSE_UNICODE +#endif // __CYGWIN__ + } -struct MacDirectoryIterator -{ - CInfoPBRec m_CPB ; - wxInt16 m_index ; - long m_dirId ; - Str255 m_name ; -} ; + return buf; -static int g_iter_flags ; +#if !wxUSE_UNICODE + #undef cbuf +#endif -static MacDirectoryIterator g_iter ; -wxString g_iter_spec ; +#endif + // __WXWINCE__ +} -wxString wxFindFirstFile(const wxChar *spec, int flags) +#if WXWIN_COMPATIBILITY_2_6 +wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) { - wxString result; - - g_iter_spec = spec ; - g_iter_spec.MakeUpper() ; - g_iter_flags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(spec)); - FSSpec fsspec ; - - wxMacFilename2FSSpec( path , &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( ) ; + return wxDoGetCwd(buf,sz); } +#endif // WXWIN_COMPATIBILITY_2_6 -wxString wxFindNextFile() +wxString wxGetCwd() { - wxString result; - - short err = noErr ; - wxString name ; - - while(1) - { - 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) ; - - wxString name = wxMacFSSpec2MacFilename( &spec ) ; - if ( g_iter_spec.Right(4)==(":*.*") || g_iter_spec.Right(2)==(":*") || name.Upper().Matches(g_iter_spec) ) - return name ; - } - return wxEmptyString ; + wxString str; + wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN); + return str; } -#elif defined(__WXMSW__) - -#ifdef __WIN32__ - static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE; - static WIN32_FIND_DATA gs_findDataStruct; -#else // Win16 - #ifdef __BORLANDC__ - static struct ffblk gs_findDataStruct; - #else - static struct _find_t gs_findDataStruct; - #endif // Borland -#endif // Win32/16 - -static wxString gs_strFileSpec; -static int gs_findFlags = 0; - -wxString wxFindFirstFile(const wxChar *spec, int flags) +bool wxSetWorkingDirectory(const wxString& d) { - wxString result; - - gs_strFileSpec = spec; - gs_findFlags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - -#ifdef __WIN32__ - if ( gs_hFileStruct != INVALID_HANDLE_VALUE ) - FindClose(gs_hFileStruct); - - gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct); - - if ( gs_hFileStruct == INVALID_HANDLE_VALUE ) + bool success = false; +#if defined(__OS2__) + if (d[1] == ':') { - result.Empty(); - - return result; + ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1); + // do not call DosSetCurrentDir when just changing drive, + // since it requires e.g. "d:." instead of "d:"! + if (d.length() == 2) + return true; } + success = (::DosSetCurrentDir(d.c_str()) == 0); +#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) + success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0); +#elif defined(__WINDOWS__) - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - - if (isdir && !(flags & wxDIR)) - return wxFindNextFile(); - else if (!isdir && flags && !(flags & wxFILE)) - return wxFindNextFile(); - - result += gs_findDataStruct.cFileName; - - return result; -#else // !Win32 - int flag = _A_NORMAL; - if (flags & wxDIR) - flag = _A_SUBDIR; - -#ifdef __BORLANDC__ - if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0) +#ifdef __WIN32__ +#ifdef __WXWINCE__ + // No equivalent in WinCE + wxUnusedVar(d); #else - if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) + success = (SetCurrentDirectory(d.t_str()) != 0); #endif - { - char attrib; - -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; #else - attrib = gs_findDataStruct.attrib; -#endif + // Must change drive, too. + bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':')); + if (isDriveSpec) + { + wxChar firstChar = d[0]; - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - return wxFindNextFile(); - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - return wxFindNextFile(); + // To upper case + if (firstChar > 90) + firstChar = firstChar - 32; - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; + // To a drive number + unsigned int driveNo = firstChar - 64; + if (driveNo > 0) + { + unsigned int noDrives; + _dos_setdrive(driveNo, &noDrives); } + } + success = (chdir(WXSTRINGCAST d) == 0); +#endif - return result; -#endif // __WIN32__ +#endif + if ( !success ) + { + wxLogSysError(_("Could not set current working directory")); + } + return success; } - -wxString wxFindNextFile() +// Get the OS directory if appropriate (such as the Windows directory). +// On non-Windows platform, probably just return the empty string. +wxString wxGetOSDirectory() { - wxString result; - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - -try_again: - -#ifdef __WIN32__ - if (gs_hFileStruct == INVALID_HANDLE_VALUE) - return result; - - bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0); - if (!success) - { - FindClose(gs_hFileStruct); - gs_hFileStruct = INVALID_HANDLE_VALUE; - } - else +#ifdef __WXWINCE__ + return wxString(wxT("\\Windows")); +#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__) + wxChar buf[MAX_PATH]; + if ( !GetWindowsDirectory(buf, MAX_PATH) ) { - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - - if (isdir && !(gs_findFlags & wxDIR)) - goto try_again; - else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; - - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - result << gs_findDataStruct.cFileName; + wxLogLastError(wxS("GetWindowsDirectory")); } - return result; -#else // Win16 - -#ifdef __BORLANDC__ - if (findnext(&gs_findDataStruct) == 0) + return wxString(buf); +#elif defined(__WXMAC__) && wxOSX_USE_CARBON + return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false); #else - if (_dos_findnext(&gs_findDataStruct) == 0) + return wxEmptyString; #endif - { - /* MATTHEW: [5] Check directory flag */ - char attrib; +} -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; -#else - attrib = gs_findDataStruct.attrib; -#endif +bool wxEndsWithPathSeparator(const wxString& filename) +{ + return !filename.empty() && wxIsPathSeparator(filename.Last()); +} - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - goto try_again; - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; +// find a file in a list of directories, returns false if not found +bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile) +{ + // we assume that it's not empty + wxCHECK_MSG( !szFile.empty(), false, + wxT("empty file name in wxFindFileInPath")); + // skip path separator in the beginning of the file name if present + wxString szFile2; + if ( wxIsPathSeparator(szFile[0u]) ) + szFile2 = szFile.Mid(1); + else + szFile2 = szFile; - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; + wxStringTokenizer tkn(szPath, wxPATH_SEP); + + while ( tkn.HasMoreTokens() ) + { + wxString strFile = tkn.GetNextToken(); + if ( !wxEndsWithPathSeparator(strFile) ) + strFile += wxFILE_SEP_PATH; + strFile += szFile2; + + if ( wxFileExists(strFile) ) + { + *pStr = strFile; + return true; } + } - return result; -#endif // Win32/16 + return false; } -#elif defined(__WXPM__) - -wxString wxFindFirstFile(const wxChar *spec, int flags) +#if WXWIN_COMPATIBILITY_2_8 +void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName, + wxString *pstrPath, + wxString *pstrName, + wxString *pstrExt) { - wxString result; + wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt); +} +#endif // #if WXWIN_COMPATIBILITY_2_8 - /* - // TODO: figure something out here for OS/2 - gs_strFileSpec = spec; - gs_findFlags = flags; +#if wxUSE_DATETIME - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); +time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename) +{ + wxDateTime mtime; + if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) ) + return (time_t)-1; - int flag = _A_NORMAL; - if (flags & wxDIR) - flag = _A_SUBDIR; + return mtime.GetTicks(); +} - if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) - { - char attrib; - attrib = gs_findDataStruct.attrib; +#endif // wxUSE_DATETIME - 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; -} +// Parses the filterStr, returning the number of filters. +// Returns 0 if none or if there's a problem. +// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg" -wxString wxFindNextFile() +int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr, + wxArrayString& descriptions, + wxArrayString& filters) { - wxString result; - // TODO: - return result; -} + descriptions.Clear(); + filters.Clear(); -#endif // Unix/Windows/OS/2 + wxString str(filterStr); -// Get current working directory. -// If buf is NULL, allocates space using new, else -// copies into buf. -wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) -{ - if (!buf) - buf = new wxChar[sz+1]; -#if wxUSE_UNICODE - char *cbuf = new char[sz+1]; -#ifdef _MSC_VER - if (_getcwd(cbuf, sz) == NULL) { -#elif defined(__WXMAC__) && !defined(__DARWIN__) - 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 // wxUnicode -#ifdef _MSC_VER - if (_getcwd(buf, 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 ) + wxString description, filter; + int pos = 0; + while( pos != wxNOT_FOUND ) { - cwdSpec.vRefNum = pb.ioFCBVRefNum; - cwdSpec.parID = pb.ioFCBParID; - cwdSpec.name[0] = 0 ; - wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ; + pos = str.Find(wxT('|')); + if ( pos == wxNOT_FOUND ) + { + // if there are no '|'s at all in the string just take the entire + // string as filter and make description empty for later autocompletion + if ( filters.IsEmpty() ) + { + descriptions.Add(wxEmptyString); + filters.Add(filterStr); + } + else + { + wxFAIL_MSG( wxT("missing '|' in the wildcard string!") ); + } - strcpy( buf , res ) ; - buf[res.length()]=0 ; + break; + } + + description = str.Left(pos); + str = str.Mid(pos + 1); + pos = str.Find(wxT('|')); + if ( pos == wxNOT_FOUND ) + { + filter = str; + } + else + { + filter = str.Left(pos); + str = str.Mid(pos + 1); + } + + descriptions.Add(description); + filters.Add(filter); } - else - buf[0] = 0 ; - /* - this version will not always give back the application directory on mac - enum + +#if defined(__WXMOTIF__) + // split it so there is one wildcard per entry + for( size_t i = 0 ; i < descriptions.GetCount() ; i++ ) { - 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 -#endif - buf[0] = wxT('.'); - buf[1] = wxT('\0'); - } -#if wxUSE_UNICODE - else { - wxConvFile.MB2WC(buf, cbuf, sz); - delete [] cbuf; - } + pos = filters[i].Find(wxT(';')); + if (pos != wxNOT_FOUND) + { + // first split only filters + descriptions.Insert(descriptions[i],i+1); + filters.Insert(filters[i].Mid(pos+1),i+1); + filters[i]=filters[i].Left(pos); + + // autoreplace new filter in description with pattern: + // C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h + // cause split into: + // C/C++ Files(*.cpp)|*.cpp + // C/C++ Files(*.c;*.h)|*.c;*.h + // and next iteration cause another split into: + // C/C++ Files(*.cpp)|*.cpp + // C/C++ Files(*.c)|*.c + // C/C++ Files(*.h)|*.h + for ( size_t k=i;kbefore.Find(wxT(')'),true)) + { + before = before.Left(pos+1); + before << filters[k]; + pos = after.Find(wxT(')')); + int pos1 = after.Find(wxT('(')); + if (pos != wxNOT_FOUND && (pos 1) && (d[1] == ':')); - if (isDriveSpec) - { - wxChar firstChar = d[0]; - - // To upper case - if (firstChar > 90) - firstChar = firstChar - 32; + // quoting the MSDN: "To obtain a handle to a directory, call the + // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this + // doesn't work under Win9x/ME but then it's not needed there anyhow + const DWORD dwAttr = ::GetFileAttributes(path.t_str()); + if ( dwAttr == INVALID_FILE_ATTRIBUTES ) + { + // file probably doesn't exist at all + return false; + } - // To a drive number - unsigned int driveNo = firstChar - 64; - if (driveNo > 0) + if ( wxGetOsVersion() == wxOS_WINDOWS_9X ) { - unsigned int noDrives; - _dos_setdrive(driveNo, &noDrives); + // FAT directories always allow all access, even if they have the + // readonly flag set, and FAT files can only be read-only + return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) || + (access != GENERIC_WRITE || + !(dwAttr & FILE_ATTRIBUTE_READONLY)); } - } - bool success = (chdir(WXSTRINGCAST d) == 0); - return success; -#endif + HANDLE h = ::CreateFile + ( + path.t_str(), + access, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + dwAttr & FILE_ATTRIBUTE_DIRECTORY + ? FILE_FLAG_BACKUP_SEMANTICS + : 0, + NULL + ); + if ( h != INVALID_HANDLE_VALUE ) + CloseHandle(h); + + return h != INVALID_HANDLE_VALUE; +} +#endif // __WINDOWS__ +bool wxIsWritable(const wxString &path) +{ +#if defined( __UNIX__ ) || defined(__OS2__) + // access() will take in count also symbolic links + return wxAccess(path.c_str(), W_OK) == 0; +#elif defined( __WINDOWS__ ) + return wxCheckWin32Permission(path, GENERIC_WRITE); +#else + wxUnusedVar(path); + // TODO + return false; #endif } -// Get the OS directory if appropriate (such as the Windows directory). -// On non-Windows platform, probably just return the empty string. -wxString wxGetOSDirectory() +bool wxIsReadable(const wxString &path) { -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) - wxChar buf[256]; - GetWindowsDirectory(buf, 256); - return wxString(buf); +#if defined( __UNIX__ ) || defined(__OS2__) + // access() will take in count also symbolic links + return wxAccess(path.c_str(), R_OK) == 0; +#elif defined( __WINDOWS__ ) + return wxCheckWin32Permission(path, GENERIC_READ); #else - return wxEmptyString; + wxUnusedVar(path); + // TODO + return false; #endif } -bool wxEndsWithPathSeparator(const wxChar *pszFileName) +bool wxIsExecutable(const wxString &path) { - size_t len = wxStrlen(pszFileName); - if ( len == 0 ) - return FALSE; - else - return wxIsPathSeparator(pszFileName[len - 1]); +#if defined( __UNIX__ ) || defined(__OS2__) + // access() will take in count also symbolic links + return wxAccess(path.c_str(), X_OK) == 0; +#elif defined( __WINDOWS__ ) + return wxCheckWin32Permission(path, GENERIC_EXECUTE); +#else + wxUnusedVar(path); + // TODO + return false; +#endif } -// find a file in a list of directories, returns false if not found -bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile) +// 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) { - // we assume that it's not empty - wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE, - _T("empty file name in wxFindFileInPath")); - - // skip path separator in the beginning of the file name if present - if ( wxIsPathSeparator(*pszFile) ) - pszFile++; - - // copy the path (strtok will modify it) - wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1]; - wxStrcpy(szPath, pszPath); - - wxString strFile; - wxChar *pc, *save_ptr; - for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr); - pc != NULL; - pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) ) +#if defined __WINDOWS__ && !defined __WXWINCE__ && defined wxGetOSFHandle + switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE) { - // search for the file in this directory - strFile = pc; - if ( !wxEndsWithPathSeparator(pc) ) - strFile += wxFILE_SEP_PATH; - strFile += pszFile; - - if ( FileExists(strFile) ) { - *pStr = strFile; - break; - } + case FILE_TYPE_CHAR: + return wxFILE_KIND_TERMINAL; + case FILE_TYPE_DISK: + return wxFILE_KIND_DISK; + case FILE_TYPE_PIPE: + return wxFILE_KIND_PIPE; } - // suppress warning about unused variable save_ptr when wxStrtok() is a - // macro which throws away its third argument - save_ptr = pc; + return wxFILE_KIND_UNKNOWN; - delete [] szPath; +#elif defined(__UNIX__) + if (isatty(fd)) + return wxFILE_KIND_TERMINAL; - return pc != NULL; // if true => we breaked from the loop -} + struct stat st; + fstat(fd, &st); -void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, - wxString *pstrPath, - wxString *pstrName, - wxString *pstrExt) -{ - // it can be empty, but it shouldn't be NULL - wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") ); + if (S_ISFIFO(st.st_mode)) + return wxFILE_KIND_PIPE; + if (!S_ISREG(st.st_mode)) + return wxFILE_KIND_UNKNOWN; - wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt); + #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 } -time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) +wxFileKind wxGetFileKind(FILE *fp) { - wxStructStat buf; - - wxStat(filename.fn_str(), &buf); - return buf.st_mtime; + // Note: The watcom rtl dll doesn't have fileno (the static lib does). + // Should be fixed in version 1.4. +#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4) + (void)fp; + return wxFILE_KIND_DISK; +#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) && !defined(__WINE__) + return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN; +#else + return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN; +#endif } @@ -1938,172 +1923,132 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) bool wxIsWild( const wxString& pattern ) { - wxString tmp = pattern; - wxChar *pat = WXSTRINGCAST(tmp); - while (*pat) { - switch (*pat++) { - case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'): - return TRUE; - case wxT('\\'): - if (!*pat++) - return FALSE; + for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p ) + { + switch ( (*p).GetValue() ) + { + case wxT('?'): + case wxT('*'): + case wxT('['): + case wxT('{'): + return true; + + case wxT('\\'): + if ( ++p == pattern.end() ) + return false; } } - return FALSE; -}; + return false; +} -bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) +/* +* 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) +*/ -#if defined(HAVE_FNMATCH_H) +bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) { -// 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 + if (text.empty()) + { + /* Match if both are empty. */ + return pat.empty(); + } -// #pragma error Broken implementation of wxMatchWild() -- needs fixing! - - /* - * WARNING: this code is broken! - */ -{ - 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; - - 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; - } - } else if (*pattern != *str) { - pattern++; - goto repeat; + 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('*')) + { + ma = ++m; + na = n; + just = 1; + acount = count; + } + else if (*m == wxT('?')) + { + m++; + if (!*n++) + return false; + } + else + { + if (*m == wxT('\\')) + { + m++; + /* Quoting "nothing" is a bad thing */ + if (!*m) + return false; } - pattern++; - while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) { - if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0'))) - pattern++; - pattern++; + 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; } - if (*pattern != wxT('\0')) { - pattern++, str++; + /* + * 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++; } - 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++); - } - 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 { - 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 (ma) + { + m = ma; + n = ++na; + count = acount; } - if (*pattern != wxT('\0')) - pattern++; - } - break; - default: - if (*str == *pattern) { - str++, pattern++; - } else { - done = TRUE; + else + return false; } } } - while (*pattern == wxT('*')) - pattern++; - return ((*str == wxT('\0')) && (*pattern == wxT('\0'))); -}; - -#endif +} #ifdef __VISUALC__ #pragma warning(default:4706) // assignment within conditional expression