X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f28538c5f6721a8d07445f88fc55818927d9b6b3..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 0c2e62e736..7e2b9c3855 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1096,7 +1096,7 @@ bool wxMkdir(const wxString& dir, int perm)
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__
-  return FALSE;
+  return FALSE; //to be changed since rmdir exists in VMS7.x
 #elif defined( __WXMAC__ )
   return (rmdir(wxUnix2MacFilename( dir )) == 0);
 #else
@@ -1114,7 +1114,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 bool wxDirExists(const wxString& dir)
 {
 #ifdef __VMS__
-  return FALSE;
+  return FALSE; //To be changed since stat exists in VMS7.x
 #elif !defined(__WXMSW__)
   struct stat sbuf;
   return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
@@ -1227,7 +1227,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     static DIR *gs_dirStream = (DIR *) NULL;
     static wxString gs_strFileSpec;
     static int gs_findFlags = 0;
@@ -1237,7 +1237,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;
 
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     if (gs_dirStream)
         closedir(gs_dirStream); // edz 941103: better housekeping
 
@@ -1266,7 +1266,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     {
         result = wxFindNextFile();
     }
-#endif // !VMS
+#endif // !VMS6.x or earlier
 
     return result;
 }
@@ -1275,7 +1275,7 @@ wxString wxFindNextFile()
 {
     wxString result;
 
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
 
     // Find path only so we can concatenate
@@ -1332,11 +1332,89 @@ wxString wxFindNextFile()
 
     closedir(gs_dirStream);
     gs_dirStream = (DIR *) NULL;
-#endif // !VMS
+#endif // !VMS6.2 or earlier
 
     return result;
 }
 
+#elif defined(__WXMAC__)
+
+struct MacDirectoryIterator
+{
+	CInfoPBRec			m_CPB ;
+	wxInt16				m_index ;
+	long				m_dirId ;
+	Str255				m_name ;
+} ;
+
+static int g_iter_flags ;
+
+static MacDirectoryIterator g_iter ;
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(spec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+	FSSpec fsspec ;
+
+	wxUnixFilename2FSSpec( result , &fsspec ) ;
+	g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
+	g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
+	g_iter.m_index = 0 ;
+	
+	Boolean isDir ;
+	FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
+	if ( !isDir )
+		return wxEmptyString ;
+		
+	return wxFindNextFile( ) ;
+}
+
+wxString wxFindNextFile()
+{
+    wxString result;
+
+	short err = noErr ;
+	
+	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) ;
+								  
+	return wxMacFSSpec2UnixFilename( &spec ) ;
+}
+
 #elif defined(__WXMSW__)
 
 #ifdef __WIN32__
@@ -1521,14 +1599,25 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 	FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
 	wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
 	strcpy( buf , res ) ;
-	if (0)
+	if (0) {
 #else
   if (getcwd(cbuf, sz) == NULL) {
 #endif
     delete [] cbuf;
-#else
+#else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
+#elif defined( __WXMAC__)
+	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(buf, sz) == NULL) {
 #endif