#pragma hdrstop
#endif
+// For _A_SUBDIR, etc.
+#if defined(__BORLANDC__) && defined(__WIN16__)
+#include <dos.h>
+#endif
+
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/dir.h"
#include "wx/filefn.h" // for wxPathExists()
-#include <windows.h>
+// ----------------------------------------------------------------------------
+// define the types and functions used for file searching
+// ----------------------------------------------------------------------------
+
+// under Win16 use compiler-specific functions
+#ifdef __WIN16__
+ #ifdef __VISUALC__
+ #include <dos.h>
+ #include <errno.h>
+
+ typedef struct _find_t FIND_STRUCT;
+ #elif defined(__BORLANDC__)
+ #include <dir.h>
+
+ typedef struct ffblk FIND_STRUCT;
+ #else
+ #error "No directory searching functions for this compiler"
+ #endif
+
+ typedef FIND_STRUCT *FIND_DATA;
+ typedef char FIND_ATTR;
+
+ static inline FIND_DATA InitFindData() { return (FIND_DATA)NULL; }
+ static inline bool IsFindDataOk(FIND_DATA fd) { return fd != NULL; }
+ static inline void FreeFindData(FIND_DATA fd) { free(fd); }
+
+ static inline FIND_DATA FindFirst(const wxString& spec,
+ FIND_STRUCT * WXUNUSED(finddata))
+ {
+ // attribute to find all files
+ static const FIND_ATTR attr = 0x3F;
+
+ FIND_DATA fd = (FIND_DATA)malloc(sizeof(FIND_STRUCT));
+
+ if (
+ #ifdef __VISUALC__
+ _dos_findfirst(spec, attr, fd) == 0
+ #else // Borland
+ findfirst(spec, fd, attr) == 0
+ #endif
+ )
+ {
+ return fd;
+ }
+ else
+ {
+ free(fd);
+
+ return NULL;
+ }
+ }
+
+ static inline bool FindNext(FIND_DATA fd, FIND_STRUCT * WXUNUSED(finddata))
+ {
+ #ifdef __VISUALC__
+ return _dos_findnext(fd) == 0;
+ #else // Borland
+ return findnext(fd) == 0;
+ #endif
+ }
+
+ static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+ {
+ #ifdef __VISUALC__
+ return finddata->name;
+ #else // Borland
+ return finddata->ff_name;
+ #endif
+ }
+
+ static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+ {
+ #ifdef __VISUALC__
+ return finddata->attrib;
+ #else // Borland
+ return finddata->ff_attrib;
+ #endif
+ }
+
+ static inline bool IsDir(FIND_ATTR attr)
+ {
+ return (attr & _A_SUBDIR) != 0;
+ }
+
+ static inline bool IsHidden(FIND_ATTR attr)
+ {
+ return (attr & (_A_SYSTEM | _A_HIDDEN)) != 0;
+ }
+#else // Win32
+ #include <windows.h>
+
+ typedef WIN32_FIND_DATA FIND_STRUCT;
+ typedef HANDLE FIND_DATA;
+ typedef DWORD FIND_ATTR;
+
+ static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
+
+ static inline bool IsFindDataOk(FIND_DATA fd)
+ {
+ return fd != INVALID_HANDLE_VALUE;
+ }
+
+ static inline void FreeFindData(FIND_DATA fd)
+ {
+ if ( !::FindClose(fd) )
+ {
+ wxLogLastError(_T("FindClose"));
+ }
+ }
+
+ static inline FIND_DATA FindFirst(const wxString& spec,
+ FIND_STRUCT *finddata)
+ {
+ return ::FindFirstFile(spec, finddata);
+ }
+
+ static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+ {
+ return ::FindNextFile(fd, finddata) != 0;
+ }
+
+ static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+ {
+ return finddata->cFileName;
+ }
+
+ static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+ {
+ return finddata->dwFileAttributes;
+ }
+
+ static inline bool IsDir(FIND_ATTR attr)
+ {
+ return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+ }
+
+ static inline bool IsHidden(FIND_ATTR attr)
+ {
+ return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+ }
+#endif // __WIN16__
// ----------------------------------------------------------------------------
// constants
void Rewind();
bool Read(wxString *filename);
+ const wxString& GetName() const { return m_dirname; }
+
private:
- HANDLE m_handle;
+ FIND_DATA m_finddata;
wxString m_dirname;
wxString m_filespec;
wxDirData::wxDirData(const wxString& dirname)
: m_dirname(dirname)
{
- m_handle = INVALID_HANDLE_VALUE;
-
- // throw away the trailing slashes
- size_t n = m_dirname.length();
- wxCHECK_RET( n, _T("empty dir name in wxDir") );
-
- while ( n > 0 && wxIsPathSeparator(m_dirname[--n]) )
- ;
-
- m_dirname.Truncate(n + 1);
+ m_finddata = InitFindData();
}
wxDirData::~wxDirData()
void wxDirData::Close()
{
- if ( m_handle != INVALID_HANDLE_VALUE )
+ if ( IsFindDataOk(m_finddata) )
{
- if ( !::FindClose(m_handle) )
- {
- wxLogLastError(_T("FindClose"));
- }
+ FreeFindData(m_finddata);
+
+ m_finddata = InitFindData();
}
}
{
bool first = FALSE;
+#ifdef __WIN32__
WIN32_FIND_DATA finddata;
- if ( m_handle == INVALID_HANDLE_VALUE )
+ #define PTR_TO_FINDDATA (&finddata)
+#else // Win16
+ #define PTR_TO_FINDDATA (m_finddata)
+#endif
+
+ if ( !IsFindDataOk(m_finddata) )
{
// open first
- m_handle = ::FindFirstFile(!m_filespec ? _T("*.*") : m_filespec.c_str(),
- &finddata);
+ wxString filespec = m_dirname;
+ if ( !wxEndsWithPathSeparator(filespec) )
+ {
+ filespec += _T('\\');
+ }
+ filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
+
+ m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
first = TRUE;
}
- if ( m_handle == INVALID_HANDLE_VALUE )
+ if ( !IsFindDataOk(m_finddata) )
{
+#ifdef __WIN32__
DWORD err = ::GetLastError();
- if ( err != ERROR_NO_MORE_FILES )
+ if ( err != ERROR_FILE_NOT_FOUND )
{
wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
m_dirname.c_str());
}
+#endif // __WIN32__
//else: not an error, just no (such) files
return FALSE;
}
- bool matches = FALSE;
-
const wxChar *name;
- DWORD attr;
+ FIND_ATTR attr;
- while ( !matches )
+ for ( ;; )
{
if ( first )
{
}
else
{
- if ( !::FindNextFile(m_handle, &finddata) )
+ if ( !FindNext(m_finddata, PTR_TO_FINDDATA) )
{
+#ifdef __WIN32__
DWORD err = ::GetLastError();
if ( err != ERROR_NO_MORE_FILES )
{
wxLogLastError(_T("FindNext"));
}
+#endif // __WIN32__
//else: not an error, just no more (such) files
return FALSE;
}
}
- name = finddata.cFileName;
- attr = finddata.dwFileAttributes;
+ name = GetNameFromFindData(PTR_TO_FINDDATA);
+ attr = GetAttrFromFindData(PTR_TO_FINDDATA);
// don't return "." and ".." unless asked for
if ( name[0] == _T('.') &&
}
// check the type now
- if ( !(m_flags & wxDIR_FILES) && !(attr & FILE_ATTRIBUTE_DIRECTORY) )
+ if ( !(m_flags & wxDIR_FILES) && !IsDir(attr) )
{
// it's a file, but we don't want them
continue;
}
- else if ( !(m_flags & wxDIR_DIRS) && (attr & FILE_ATTRIBUTE_DIRECTORY) )
+ else if ( !(m_flags & wxDIR_DIRS) && IsDir(attr) )
{
// it's a dir, and we don't want it
continue;
// finally, check whether it's a hidden file
if ( !(m_flags & wxDIR_HIDDEN) )
{
- matches = !(attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM));
+ if ( IsHidden(attr) )
+ {
+ // it's a hidden file, skip it
+ continue;
+ }
}
- }
- *filename = name;
+ *filename = name;
+
+ break;
+ }
return TRUE;
}
return m_data != NULL;
}
+wxString wxDir::GetName() const
+{
+ wxString name;
+ if ( m_data )
+ {
+ name = M_DIR->GetName();
+ if ( !name.empty() )
+ {
+ // bring to canonical Windows form
+ name.Replace(_T("/"), _T("\\"));
+
+ if ( name.Last() == _T('\\') )
+ {
+ // chop off the last (back)slash
+ name.Truncate(name.length() - 1);
+ }
+ }
+ }
+
+ return name;
+}
+
wxDir::~wxDir()
{
delete M_DIR;
projects / wxWidgets.git / blobdiff