/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// 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__
#pragma warning(disable:4706) // assignment within conditional expression
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
#if !(defined(_MSC_VER) && (_MSC_VER > 800))
#include <errno.h>
#endif
#endif
#if defined(__WXMAC__)
- #include "wx/mac/private.h" // includes mac headers
-#endif
-
-#include <time.h>
-
-#ifndef __MWERKS__
- #include <sys/types.h>
- #include <sys/stat.h>
-#else
- #include <stat.h>
- #include <unistd.h>
- #include <unix.h>
-#endif
-
-#ifdef __UNIX__
- #include <unistd.h>
- #include <dirent.h>
-#endif
-
-#ifdef __WXPM__
- #include <process.h>
- #include "wx/os2/private.h"
-#endif
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
- #include <direct.h>
- #include <dos.h>
- #include <io.h>
-#endif // __WINDOWS__
-#endif // native Win compiler
-
-#if defined(__DOS__)
- #ifdef __WATCOMC__
- #include <direct.h>
- #include <dos.h>
- #include <io.h>
- #endif
- #ifdef __DJGPP__
- #include <unistd.h>
- #endif
-#endif
-
-#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
- // this (3.1 I believe) and how to test for it.
- // If this works for Borland 4.0 as well, then no worries.
- #include <dir.h>
-#endif
-
-#ifdef __SALFORDC__
- #include <dir.h>
- #include <unix.h>
-#endif
-
-#include "wx/setup.h"
-#include "wx/log.h"
-
-// No, Cygwin doesn't appear to have fnmatch.h after all.
-#if defined(HAVE_FNMATCH_H)
- #include "fnmatch.h"
+ #include "wx/osx/private.h" // includes mac headers
#endif
#ifdef __WINDOWS__
- #include <windows.h>
+ #include "wx/msw/private.h"
#include "wx/msw/mslu.h"
// sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
#ifdef __CYGWIN__
#include <sys/cygwin.h>
#endif
- #include <wchar.h>
- #ifndef __TWIN32__
- #include <sys/unistd.h>
- #endif
#endif // __GNUWIN32__
+
+ // io.h is needed for _get_osfhandle()
+ // Already included by filefn.h for many Windows compilers
+ #if defined __MWERKS__ || defined __CYGWIN__
+ #include <io.h>
+ #endif
#endif // __WINDOWS__
+#if defined(__VMS__)
+ #include <fab.h>
+#endif
+
// TODO: Borland probably has _wgetcwd as well?
#ifdef _MSC_VER
#define HAVE_WGETCWD
#define _MAXPATHLEN 1024
#endif
-#ifdef __WXMAC__
-# include "MoreFiles.h"
-# include "MoreFilesExtras.h"
-# include "FullPath.h"
-# include "FSpCompat.h"
+#ifndef INVALID_FILE_ATTRIBUTES
+ #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-
// ----------------------------------------------------------------------------
// private globals
// ----------------------------------------------------------------------------
-// MT-FIXME: get rid of this horror and all code using it
+#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
+
+// ----------------------------------------------------------------------------
+// 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 wxString& path)
+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);
+ // 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;
- wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
- filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+ 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; i<GetCount(); i++)
{
- wxChar *path = (wxChar *) node->Data ();
- 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(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN);
+ wxString buf = ::wxGetCwd();
if ( !wxEndsWithPathSeparator(buf) )
{
return buf;
}
+// ----------------------------------------------------------------------------
+// miscellaneous global functions
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_8
+static inline wxChar* MYcopystring(const wxString& s)
+{
+ wxChar* copy = new wxChar[s.length() + 1];
+ return wxStrcpy(copy, s.c_str());
+}
+
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)
+{
+ CharType* copy = new CharType[wxStrlen(s) + 1];
+ return wxStrcpy(copy, s);
+}
+#endif
+
+
bool
wxFileExists (const wxString& filename)
{
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
- // GetFileAttributes can copy with network paths unlike stat()
- DWORD ret = ::GetFileAttributes(filename);
-
- return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+#if defined(__WXPALMOS__)
+ return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
+ // we must use GetFileAttributes() instead of the ANSI C functions because
+ // it can cope with network (UNC) paths unlike them
+ DWORD ret = ::GetFileAttributes(filename.fn_str());
+
+ return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+#else // !__WIN32__
+ #ifndef S_ISREG
+ #define S_ISREG(mode) ((mode) & S_IFREG)
+ #endif
+ wxStructStat st;
+#ifndef wxNEED_WX_UNISTD_H
+ return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
+#ifdef __OS2__
+ || (errno == EACCES) // if access is denied something with that name
+ // exists and is opened in exclusive mode.
+#endif
+ ;
#else
- wxStructStat stbuf;
- if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
- return TRUE;
-
- return FALSE;
+ return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
#endif
+#endif // __WIN32__/!__WIN32__
}
bool
wxIsAbsolutePath (const wxString& filename)
{
- if (filename != wxT(""))
+ if (!filename.empty())
{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- // Classic or Carbon CodeWarrior like
- // 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<typename T>
+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<typename CharType>
+static CharType *wxDoRealPath (CharType *path)
{
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- static const wxChar SEP = wxT('\\');
- Unix2DosFilename(path);
-#else
- static const wxChar SEP = wxT('/');
+ 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
{
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))
{
path[0] = SEP;
path[1] = wxT('\0');
}
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__OS2__)
/* Check that path[2] is NULL! */
else if (path[1] == wxT(':') && !path[2])
{
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];
+ 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 copystring( wxRealPath(buf) );
- }
- return copystring( wxFileFunctionsBuffer );
+ buf << wxFileFunctionsBuffer;
+ buf = wxRealPath( buf );
+ return MYcopystring( buf );
+ }
+ return MYcopystring( wxFileFunctionsBuffer );
}
/*-
/* input name in name, pathname output to buf. */
-wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
+template<typename CharType>
+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;
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- const wxChar SEP = wxT('\\');
-#else
- const wxChar SEP = wxT('/');
+ //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<const CharType*>(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;
while ((*d++ = *s) != 0) {
# ifndef __WXMSW__
if (*s == wxT('\\')) {
- if ((*(d - 1) = *++s)) {
+ if ((*(d - 1) = *++s)!=0) {
s++;
continue;
} else
} else
# endif
#endif
+ // No env variables on WinCE
+#ifndef __WXWINCE__
#ifdef __WXMSW__
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;
*--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;
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;
+ homepath = wxGetUserHome(wxString(nm + 1));
+ if (homepath.empty())
+ {
+ if (was_sep) /* replace only if it was there: */
+ *s = SEP;
s = NULL;
- } else {
+ }
+ else
+ {
nm = nnm;
- s = home;
+ s = (CharType*)(const CharType*)homepath.c_str();
}
}
}
*(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:
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);
+ wxStrcpy (dest, filename);
#ifdef __WXMSW__
- Unix2DosFilename(dest);
+ 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);
- 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;
}
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
// Return just the filename, not the path (basename)
wxChar *wxFileNameFromPath (wxChar *path)
{
// 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(']'))
{
i --;
}
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
}
#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);
+ wxStrcpy(buf, path);
- int l = path.Length();
+ 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(']'))
{
i --;
}
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
}
#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__
- int i;
- int j;
- OSErr theErr;
- OSStatus theStatus;
- Boolean isDirectory = false;
- Str255 theParentPath = "\p";
- FSSpec theParentSpec;
- FSRef theParentRef;
- char theFileName[FILENAME_MAX];
- char thePath[FILENAME_MAX];
-
- strcpy(thePath, "");
-
- // GD: Separate file name from path and make a FSRef to the parent
- // directory. This is necessary since FSRefs cannot reference files
- // that have not yet been created.
- // Based on example code from Apple Technical Note TN2022
- // http://developer.apple.com/technotes/tn/tn2022.html
-
- // check whether we are converting a directory
- isDirectory = ((spec->name)[spec->name[0]] == ':');
- // count length of file name
- for (i = spec->name[0] - (isDirectory ? 1 : 0); ((spec->name[i] != ':') && (i > 0)); i--);
- // copy file name
- // prepend path separator since it will later be appended to the path
- theFileName[0] = wxFILE_SEP_PATH;
- for (j = i + 1; j <= spec->name[0] - (isDirectory ? 1 : 0); j++) {
- theFileName[j - i] = spec->name[j];
- }
- theFileName[j - i] = '\0';
- // copy path if any
- for (j = 1; j <= i; j++) {
- theParentPath[++theParentPath[0]] = spec->name[j];
- }
- theErr = FSMakeFSSpec(spec->vRefNum, spec->parID, theParentPath, &theParentSpec);
- if (theErr == noErr) {
- // convert the FSSpec to an FSRef
- theErr = FSpMakeFSRef(&theParentSpec, &theParentRef);
- }
- if (theErr == noErr) {
- // get the POSIX path associated with the FSRef
- theStatus = FSRefMakePath(&theParentRef,
- (UInt8 *)thePath, sizeof(thePath));
- }
- if (theStatus == noErr) {
- // append file name to path
- // includes previously prepended path separator
- strcat(thePath, theFileName);
- }
-
- // create path string for return value
- wxString result( thePath ) ;
-#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;
-
- // 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
+ CFURLRef fullURLRef;
+ fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+ if ( additionalPathComponent )
+ {
+ CFURLRef parentURLRef = fullURLRef ;
+ fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+ additionalPathComponent,false);
+ CFRelease( parentURLRef ) ;
+ }
+ CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+ CFRelease( fullURLRef ) ;
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
+ CFRelease( cfString );
+ CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+ return wxCFStringRef(cfMutableString).AsString();
}
-#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) ;
+ CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+ uniname->unicode,
+ uniname->length );
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
+ CFRelease( cfname );
+ CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+ return wxCFStringRef(cfMutableString).AsString() ;
}
-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<typename T>
+static void wxDoDos2UnixFilename(T *s)
{
if (s)
while (*s)
{
- if (*s == '\\')
- *s = '/';
+ if (*s == wxT('\\'))
+ *s = wxT('/');
#ifdef __WXMSW__
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<typename T>
+static void
+#if defined(__WXMSW__) || 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(__WXMSW__) || defined(__OS2__)
if (s)
while (*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
}
-// Copy files
-bool
-wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
+// helper of generic implementation of wxCopyFile()
+#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \
+ wxUSE_FILE
+
+static bool
+wxDoCopyFile(wxFile& fileIn,
+ const wxStructStat& fbuf,
+ const wxString& filenameDst,
+ bool overwrite)
{
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
- // CopyFile() copies file attributes and modification time too, so use it
- // instead of our code if available
- //
- // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
- if ( !::CopyFile(file1, file2, !overwrite) )
- {
- wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
- file1.c_str(), file2.c_str());
+ // reset the umask as we want to create the file with exactly the same
+ // permissions as the original one
+ wxCHANGE_UMASK(0);
- return FALSE;
+ // 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;
}
-#elif defined(__WXPM__)
- if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
- return FALSE;
-#else // !Win32
- wxStructStat fbuf;
+ // 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)
+{
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+ // CopyFile() copies file attributes and modification time too, so use it
+ // instead of our code if available
+ //
+ // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+ if ( !::CopyFile(file1.fn_str(), file2.fn_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 defined(__PALMOS__)
+ // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
+ return false;
+#elif wxUSE_FILE // !Win32
+
+ wxStructStat fbuf;
// get permissions of file1
- if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 )
+ if ( wxStat( file1.c_str(), &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
{
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
+
+#else // !Win32 && ! wxUSE_FILE
+
+ // impossible to simulate with wxWidgets API
+ wxUnusedVar(file1);
+ wxUnusedVar(file2);
+ wxUnusedVar(overwrite);
+ return false;
+
#endif // __WXMSW__ && __WIN32__
- return TRUE;
+ 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__) && !defined(__WXPALMOS__)
+ // 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;
+ return false;
}
bool wxRemoveFile(const wxString& file)
#if defined(__VISUALC__) \
|| defined(__BORLANDC__) \
|| defined(__WATCOMC__) \
- || defined(__GNUWIN32__)
- int res = wxRemove(file);
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__) \
+ || (defined(__MWERKS__) && defined(__MSL__))
+ int res = wxRemove(file);
+#elif defined(__WXMAC__)
+ int res = unlink(file.fn_str());
+#elif defined(__WXPALMOS__)
+ int res = 1;
+ // TODO with VFSFileDelete()
#else
- int res = unlink(OS_FILENAME(file));
+ int res = unlink(file.fn_str());
#endif
- return res == 0;
+ return res == 0;
}
bool wxMkdir(const wxString& dir, int perm)
{
+#if defined(__WXPALMOS__)
+ return false;
+#else
#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(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+#elif (!(defined(__WXMSW__) || 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??
+ #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 )
#error "Unsupported DOS compiler!"
#endif
#else // !MSW, !DOS and !OS/2 VAC++
- (void)perm;
- if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+ 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;
+#endif // PALMOS/!PALMOS
}
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);
-#else
-
-#ifdef __SALFORDC__
- return FALSE; // What to do?
+#if defined(__VMS__)
+ return false; //to be changed since rmdir exists in VMS7.x
+#elif defined(__WXPALMOS__)
+ // TODO with VFSFileRename()
+ return false;
#else
- return (wxRmDir(OS_FILENAME(dir)) == 0);
-#endif
+ #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;
+ }
-#endif
+ return true;
+#endif // PALMOS/!PALMOS
}
// 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);
+ wxString strPath(pathName);
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__OS2__)
// 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 "\"
+ // the paths "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(':')) )
+ if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) )
break;
strPath.Truncate(len - 1);
}
#endif // __WINDOWS__
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#ifdef __OS2__
+ // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+ if (strPath.length() == 2 && strPath[1u] == wxT(':'))
+ strPath << wxT('.');
+#endif
+
+#if defined(__WXPALMOS__)
+ return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// stat() can't cope with network paths
- DWORD ret = ::GetFileAttributes(strPath);
+ DWORD ret = ::GetFileAttributes(strPath.fn_str());
+
+ return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+#elif defined(__OS2__)
+ FILESTATUS3 Info = {{0}};
+ APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
+ (void*) &Info, sizeof(FILESTATUS3));
- return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+ 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;
#ifndef __VISAGECPP__
- return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
- ((st.st_mode & S_IFMT) == S_IFDIR);
+ return wxStat(strPath.c_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);
+ return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);
#endif
#endif // __WIN32__/!__WIN32__
}
+#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 )
+#ifdef _PACC_VER
+ // work around the PalmOS pacc compiler bug
+ wxStrcpy(buf, filename.data());
+#else
wxStrcpy(buf, filename);
+#endif
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);
+
+ return false;
+#endif // wxUSE_FILE/!wxUSE_FILE
}
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
// Get first file name matching given wild card.
static wxDir *gs_dir = NULL;
static wxString gs_dirPath;
-wxString wxFindFirstFile(const wxChar *spec, int flags)
+wxString wxFindFirstFile(const wxString& spec, int flags)
{
- wxSplitPath(spec, &gs_dirPath, NULL, NULL);
- if ( gs_dirPath.IsEmpty() )
+ wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);
+ if ( gs_dirPath.empty() )
gs_dirPath = wxT(".");
- if ( gs_dirPath.Last() != wxFILE_SEP_PATH )
+ if ( !wxEndsWithPathSeparator(gs_dirPath ) )
gs_dirPath << wxFILE_SEP_PATH;
- if (gs_dir)
- delete gs_dir;
+ delete gs_dir; // can be NULL, this is ok
gs_dir = new wxDir(gs_dirPath);
if ( !gs_dir->IsOpened() )
return wxEmptyString;
}
- int dirFlags = 0;
+ int dirFlags;
switch (flags)
{
case wxDIR: dirFlags = wxDIR_DIRS; break;
}
wxString result;
- gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
- if ( result.IsEmpty() )
+ gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
+ if ( result.empty() )
{
wxDELETE(gs_dir);
return result;
wxString wxFindNextFile()
{
- wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );
+ wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );
wxString result;
gs_dir->GetNext(&result);
- if ( result.IsEmpty() )
+ if ( result.empty() )
{
wxDELETE(gs_dir);
return result;
// 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
+ if(buf && sz>0) buf[0] = wxT('\0');
+ return buf;
+#elif defined(__WXWINCE__)
+ // TODO
+ if(buf && sz>0) buf[0] = wxT('\0');
+ return buf;
+#else
if ( !buf )
{
buf = new wxChar[sz + 1];
}
- bool ok = FALSE;
+ bool ok wxDUMMY_INITIALIZE(false);
// for the compilers which have Unicode version of _getcwd(), call it
// directly, for the others call the ANSI version and do the translation
#if !wxUSE_UNICODE
#define cbuf buf
#else // wxUSE_UNICODE
- bool needsANSI = TRUE;
+ bool needsANSI = true;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
- wxCharBuffer c_buffer(sz);
- char *cbuf = (char*)(const char*)c_buffer;
+ char cbuf[_MAXPATHLEN];
#endif
#ifdef HAVE_WGETCWD
#if wxUSE_UNICODE_MSLU
- if ( wxGetOsVersion() != wxWIN95 )
+ if ( wxGetOsVersion() != wxOS_WINDOWS_9X )
#else
- char *cbuf = NULL; // never really used because needsANSI will always be FALSE
+ char *cbuf = NULL; // never really used because needsANSI will always be false
#endif
{
ok = _wgetcwd(buf, sz) != NULL;
- needsANSI = FALSE;
+ needsANSI = false;
}
#endif
if ( needsANSI )
#endif // wxUSE_UNICODE
{
- #ifdef _MSC_VER
+ #if defined(_MSC_VER) || defined(__MINGW32__)
ok = _getcwd(cbuf, sz) != NULL;
- #elif defined(__WXMAC__) && !defined(__DARWIN__)
- FSSpec cwdSpec ;
- FCBPBRec pb;
- OSErr error;
- Str255 fileName ;
- pb.ioNamePtr = (StringPtr) &fileName;
- pb.ioVRefNum = 0;
- pb.ioRefNum = LMGetCurApRefNum();
- pb.ioFCBIndx = 0;
- error = PBGetFCBInfoSync(&pb);
- if ( error == noErr )
- {
- cwdSpec.vRefNum = pb.ioFCBVRefNum;
- cwdSpec.parID = pb.ioFCBParID;
- cwdSpec.name[0] = 0 ;
- wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-
- strcpy( cbuf , res ) ;
- cbuf[res.length()]=0 ;
-
- ok = TRUE;
- }
- else
+ #elif defined(__OS2__)
+ APIRET rc;
+ ULONG ulDriveNum = 0;
+ ULONG ulDriveMap = 0;
+ rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+ ok = rc == 0;
+ if (ok)
{
- ok = FALSE;
+ 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;
}
- #elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
- APIRET rc;
- rc = ::DosQueryCurrentDir( 0 // current drive
- ,cbuf
- ,(PULONG)&sz
- );
- ok = rc != 0;
#else // !Win32/VC++ !Mac !OS2
ok = getcwd(cbuf, sz) != NULL;
#endif // platform
// 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] = _T('\0');
+ buf[0] = wxT('\0');
}
else // ok, but we might need to massage the path into the right format
{
#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__
}
#if !wxUSE_UNICODE
#undef cbuf
#endif
+
+#endif
+ // __WXWINCE__
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+{
+ return wxDoGetCwd(buf,sz);
}
+#endif // WXWIN_COMPATIBILITY_2_6
wxString wxGetCwd()
{
wxString str;
-
- // we can't create wxStringBuffer object inline: Sun CC generates buggy
- // code in this case!
- {
- wxStringBuffer buf(str, _MAXPATHLEN);
- wxGetWorkingDirectory(buf, _MAXPATHLEN);
- }
-
+ wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);
return str;
}
bool wxSetWorkingDirectory(const wxString& d)
{
-#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
- return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
-#elif defined(__WXPM__)
- return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#if defined(__OS2__)
+ if (d[1] == ':')
+ {
+ ::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;
+ }
+ return (::DosSetCurrentDir(d.c_str()) == 0);
+#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
+ return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
#ifdef __WIN32__
- return (bool)(SetCurrentDirectory(d) != 0);
+#ifdef __WXWINCE__
+ // No equivalent in WinCE
+ wxUnusedVar(d);
+ return false;
#else
- // Must change drive, too.
- bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
- if (isDriveSpec)
- {
- wxChar firstChar = d[0];
+ return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
+#endif
+#else
+ // Must change drive, too.
+ bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+ if (isDriveSpec)
+ {
+ wxChar firstChar = d[0];
- // To upper case
- if (firstChar > 90)
- firstChar = firstChar - 32;
+ // To upper case
+ if (firstChar > 90)
+ firstChar = firstChar - 32;
- // To a drive number
- unsigned int driveNo = firstChar - 64;
- if (driveNo > 0)
- {
- unsigned int noDrives;
- _dos_setdrive(driveNo, &noDrives);
+ // To a drive number
+ unsigned int driveNo = firstChar - 64;
+ if (driveNo > 0)
+ {
+ unsigned int noDrives;
+ _dos_setdrive(driveNo, &noDrives);
+ }
}
- }
- bool success = (chdir(WXSTRINGCAST d) == 0);
+ bool success = (chdir(WXSTRINGCAST d) == 0);
- return success;
+ return success;
#endif
#endif
// On non-Windows platform, probably just return the empty string.
wxString wxGetOSDirectory()
{
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+#ifdef __WXWINCE__
+ return wxString(wxT("\\Windows"));
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
wxChar buf[256];
GetWindowsDirectory(buf, 256);
return wxString(buf);
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
+ return wxMacFindFolder(kOnSystemDisk, 'macs', false);
#else
return wxEmptyString;
#endif
}
-bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+bool wxEndsWithPathSeparator(const wxString& filename)
{
- size_t len = wxStrlen(pszFileName);
-
- return len && wxIsPathSeparator(pszFileName[len - 1]);
+ return !filename.empty() && wxIsPathSeparator(filename.Last());
}
// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
+bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile)
{
// we assume that it's not empty
- wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
- _T("empty file name in wxFindFileInPath"));
+ wxCHECK_MSG( !szFile.empty(), false,
+ wxT("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) )
+ wxString szFile2;
+ if ( wxIsPathSeparator(szFile[0u]) )
+ szFile2 = szFile.Mid(1);
+ else
+ szFile2 = szFile;
+
+ wxStringTokenizer tkn(szPath, wxPATH_SEP);
+
+ while ( tkn.HasMoreTokens() )
{
- // search for the file in this directory
- strFile = pc;
- if ( !wxEndsWithPathSeparator(pc) )
+ wxString strFile = tkn.GetNextToken();
+ if ( !wxEndsWithPathSeparator(strFile) )
strFile += wxFILE_SEP_PATH;
- strFile += pszFile;
+ strFile += szFile2;
- if ( FileExists(strFile) ) {
+ if ( wxFileExists(strFile) )
+ {
*pStr = strFile;
- break;
+ return true;
}
}
- // suppress warning about unused variable save_ptr when wxStrtok() is a
- // macro which throws away its third argument
- save_ptr = pc;
-
- delete [] szPath;
-
- return pc != NULL; // if true => we breaked from the loop
+ return false;
}
-void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+#if WXWIN_COMPATIBILITY_2_8
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
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") );
+ wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
+}
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
+#if wxUSE_DATETIME
+
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
+{
+ wxDateTime mtime;
+ if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+ return (time_t)-1;
- wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+ return mtime.GetTicks();
}
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+#endif // wxUSE_DATETIME
+
+
+// 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"
+
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
+ wxArrayString& descriptions,
+ wxArrayString& filters)
+{
+ descriptions.Clear();
+ filters.Clear();
+
+ wxString str(filterStr);
+
+ wxString description, filter;
+ int pos = 0;
+ while( pos != wxNOT_FOUND )
+ {
+ 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!") );
+ }
+
+ 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);
+ }
+
+#if defined(__WXMOTIF__)
+ // split it so there is one wildcard per entry
+ for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )
+ {
+ 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;k<i+2;k++ )
+ {
+ pos = descriptions[k].Find(filters[k]);
+ if (pos != wxNOT_FOUND)
+ {
+ wxString before = descriptions[k].Left(pos);
+ wxString after = descriptions[k].Mid(pos+filters[k].Len());
+ pos = before.Find(wxT('('),true);
+ if (pos>before.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<pos1 || pos1==wxNOT_FOUND))
+ {
+ before << after.Mid(pos);
+ descriptions[k] = before;
+ }
+ }
+ }
+ }
+ }
+ }
+#endif
+
+ // autocompletion
+ for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
+ {
+ if ( descriptions[j].empty() && !filters[j].empty() )
+ {
+ descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
+ }
+ }
+
+ return filters.GetCount();
+}
+
+#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__))
+static bool wxCheckWin32Permission(const wxString& path, DWORD access)
+{
+ // 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.fn_str());
+ if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+ {
+ // file probably doesn't exist at all
+ return false;
+ }
+
+ if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
+ {
+ // 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));
+ }
+
+ 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
+}
+
+bool wxIsReadable(const wxString &path)
+{
+#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
+ wxUnusedVar(path);
+ // TODO
+ return false;
+#endif
+}
+
+bool wxIsExecutable(const wxString &path)
+{
+#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
+}
+
+// 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)
{
- wxStructStat buf;
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+ switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
+ {
+ case FILE_TYPE_CHAR:
+ return wxFILE_KIND_TERMINAL;
+ case FILE_TYPE_DISK:
+ return wxFILE_KIND_DISK;
+ case FILE_TYPE_PIPE:
+ return wxFILE_KIND_PIPE;
+ }
+
+ return wxFILE_KIND_UNKNOWN;
+
+#elif defined(__UNIX__)
+ if (isatty(fd))
+ return wxFILE_KIND_TERMINAL;
+
+ struct stat st;
+ fstat(fd, &st);
+
+ if (S_ISFIFO(st.st_mode))
+ return wxFILE_KIND_PIPE;
+ if (!S_ISREG(st.st_mode))
+ return wxFILE_KIND_UNKNOWN;
+
+ #if defined(__VMS__)
+ if (st.st_fab_rfm != FAB$C_STMLF)
+ return wxFILE_KIND_UNKNOWN;
+ #endif
+
+ return wxFILE_KIND_DISK;
- wxStat(filename.fn_str(), &buf);
- return buf.st_mtime;
+#else
+ #define wxFILEKIND_STUB
+ (void)fd;
+ return wxFILE_KIND_DISK;
+#endif
+}
+
+wxFileKind wxGetFileKind(FILE *fp)
+{
+ // Note: The watcom rtl dll doesn't have fileno (the static lib does).
+ // 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
}
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;
+}
+
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* 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())
+ {
+ /* Match if both are empty. */
+ return pat.empty();
+ }
-#ifdef HAVE_FNMATCH
-{
-// 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 // !HAVE_FNMATCH
-
-// #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 // HAVE_FNMATCH/!HAVE_FNMATCH
+}
#ifdef __VISUALC__
#pragma warning(default:4706) // assignment within conditional expression
projects / wxWidgets.git / blobdiff