Misc fixes

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index f8f4989918d309d5b119766594996ab6364fa856..2a1694b0a731c87674c485fc9cbae22a46d0bf48 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -110,10 +110,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-const off_t wxInvalidOffset = (off_t)-1;
-#endif
-

 #define _MAXPATHLEN 500
 
 extern wxChar *wxBuffer;
 #define _MAXPATHLEN 500
 
 extern wxChar *wxBuffer;


@@ -134,6 +130,14 @@ extern wxChar *wxBuffer;
 
 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 
 
 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 

+#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;
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -1307,7 +1311,7 @@ wxString wxFindNextFile()
           nextDir = readdir(gs_dirStream) )
     {
         if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files
           nextDir = readdir(gs_dirStream) )
     {
         if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files

-           strcmp(nextDir->d_name, ".") && 
+           strcmp(nextDir->d_name, ".") &&

            strcmp(nextDir->d_name, "..") )
         {
             result.Empty();
            strcmp(nextDir->d_name, "..") )
         {
             result.Empty();


@@ -1412,7 +1416,7 @@ wxString wxFindNextFile()
                        
                if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
                        continue ;
                        
                if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
                        continue ;

-                        
+                       

                // hit !
                break ;
        }
                // hit !
                break ;
        }


@@ -1426,7 +1430,7 @@ wxString wxFindNextFile()
                                                                   g_iter.m_dirId,
                                                                   g_iter.m_name,
                                                                   &spec) ;
                                                                   g_iter.m_dirId,
                                                                   g_iter.m_name,
                                                                   &spec) ;

-                                                                 
+                                                               

        return wxMacFSSpec2UnixFilename( &spec ) ;
 }
 
        return wxMacFSSpec2UnixFilename( &spec ) ;
 }
 


@@ -1520,6 +1524,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     return result;
 }
 
     return result;
 }
 

+

 wxString wxFindNextFile()
 {
     wxString result;
 wxString wxFindNextFile()
 {
     wxString result;


@@ -1591,7 +1596,51 @@ try_again:
     return result;
 }
 
     return result;
 }
 

-#endif // Unix/Windows
+#elif defined(__WXPM__)
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    /*
+    // TODO: figure something out here for OS/2
+    gs_strFileSpec = spec;
+    gs_findFlags = flags;
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(gs_strFileSpec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+    int flag = _A_NORMAL;
+    if (flags & wxDIR)
+        flag = _A_SUBDIR;
+
+    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+    {
+        char attrib;
+        attrib = gs_findDataStruct.attrib;
+
+        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;
+}
+
+wxString wxFindNextFile()
+{
+    wxString result;
+    // TODO:
+    return result;
+}
+
+#endif // Unix/Windows/OS/2

 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else
 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else


@@ -1623,9 +1672,9 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #elif defined( __WXMAC__)
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #elif defined( __WXMAC__)

-       enum 
-       { 
-               SFSaveDisk = 0x214, CurDirStore = 0x398 
+       enum
+       {
+               SFSaveDisk = 0x214, CurDirStore = 0x398

        };
        FSSpec cwdSpec ;
        
        };
        FSSpec cwdSpec ;
        


@@ -1777,14 +1826,18 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 #else // assume Unix
     const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
 
 #else // assume Unix
     const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
 

-    if ( pDot == pszFileName )
+    if ( pDot )

     {
     {

-        // under Unix files like .profile are treated in a special way
-        pDot = NULL;
+        if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) )
+        {
+            // under Unix, dot may be (and commonly is) the first character of the
+            // filename, don't treat the entire filename as extension in this case
+            pDot = NULL;
+        }

     }
 #endif // MSW/Unix
 
     }
 #endif // MSW/Unix
 

-    if ( pDot < pLastSeparator )
+    if ( pDot && (pDot < pLastSeparator) )

     {
         // the dot is part of the path, not the start of the extension
         pDot = NULL;
     {
         // the dot is part of the path, not the start of the extension
         pDot = NULL;