don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 477ff3f121330f546e77c45d06df20f12de0c009..a7409aa0c89f90c004a3ffc97040806c2031bce9 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -146,7 +146,7 @@ public:
         m_hFile = ::CreateFile
                     (
                      filename,                      // name
         m_hFile = ::CreateFile
                     (
                      filename,                      // name

-                     mode == Read ? GENERIC_READ    // access mask 
+                     mode == Read ? GENERIC_READ    // access mask

                                   : GENERIC_WRITE,
                      0,                             // no sharing
                      NULL,                          // no secutity attr
                                   : GENERIC_WRITE,
                      0,                             // no sharing
                      NULL,                          // no secutity attr


@@ -415,7 +415,7 @@ void wxFileName::Assign(const wxString& fullpathOrig,
                   _T("the path shouldn't contain file name nor extension") );
 
 #else // !__WXDEBUG__
                   _T("the path shouldn't contain file name nor extension") );
 
 #else // !__WXDEBUG__

-    SplitPath(fullname, NULL /* no path */, &name, &ext, format); 
+    SplitPath(fullname, NULL /* no path */, &name, &ext, format);

     SplitPath(fullpath, &volume, &path, NULL, NULL, format);
 #endif // __WXDEBUG__/!__WXDEBUG__
 
     SplitPath(fullpath, &volume, &path, NULL, NULL, format);
 #endif // __WXDEBUG__/!__WXDEBUG__
 


@@ -751,10 +751,10 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )
         filename.AssignDir(dir);
 
         wxString currPath;
         filename.AssignDir(dir);
 
         wxString currPath;

-        if ( filename.HasVolume())  
-        { 
+        if ( filename.HasVolume())
+        {

             currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);
             currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);

-        } 
+        }

 
         wxArrayString dirs = filename.GetDirs();
         size_t count = dirs.GetCount();
 
         wxArrayString dirs = filename.GetDirs();
         size_t count = dirs.GetCount();


@@ -991,7 +991,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
         if ( m_dirs.IsEmpty() && IsDir() )
         {
             m_dirs.Add(_T('.'));
         if ( m_dirs.IsEmpty() && IsDir() )
         {
             m_dirs.Add(_T('.'));

-        }   
+        }

     }
 
     m_relative = TRUE;
     }
 
     m_relative = TRUE;


@@ -1156,8 +1156,15 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
     }
     else if ( format == wxPATH_UNIX )
     {
     }
     else if ( format == wxPATH_UNIX )
     {

-        if (!m_relative)
-            fullpath += wxFILE_SEP_PATH_UNIX;
+        if ( !m_relative )
+        {
+            // normally the absolute file names starts with a slash with one
+            // exception: file names like "~/foo.bar" don't have it
+            if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
+            {
+                fullpath += wxFILE_SEP_PATH_UNIX;
+            }
+        }

     }
 
     // then concatenate all the path components using the path separator
     }
 
     // then concatenate all the path components using the path separator


@@ -1171,46 +1178,45 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
 
         for ( size_t i = 0; i < dirCount; i++ )
         {
 
         for ( size_t i = 0; i < dirCount; i++ )
         {

-            // TODO: What to do with ".." under VMS
-

             switch (format)
             {
                 case wxPATH_MAC:
             switch (format)
             {
                 case wxPATH_MAC:

-                {
-                    if (m_dirs[i] == wxT("."))
-                        break;
-                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                    if ( m_dirs[i] == wxT(".") )
+                    {
+                        // skip appending ':', this shouldn't be done in this
+                        // case as "::" is interpreted as ".." under Unix
+                        continue;
+                    }
+
+                    // convert back from ".." to nothing
+                    if ( m_dirs[i] != wxT("..") )

                          fullpath += m_dirs[i];
                          fullpath += m_dirs[i];

-                    fullpath += wxT(':');

                     break;
                     break;

-                }
+
+                default:
+                    wxFAIL_MSG( wxT("unexpected path format") );
+                    // still fall through
+

                 case wxPATH_DOS:
                 case wxPATH_DOS:

-                {
-                    fullpath += m_dirs[i];
-                    fullpath += wxT('\\');
-                    break;
-                }

                 case wxPATH_UNIX:
                 case wxPATH_UNIX:

-                {

                     fullpath += m_dirs[i];
                     fullpath += m_dirs[i];

-                    fullpath += wxT('/');

                     break;
                     break;

-                }
+

                 case wxPATH_VMS:
                 case wxPATH_VMS:

-                {
-                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
+                    // TODO: What to do with ".." under VMS
+                    // convert back from ".." to nothing
+                    if ( m_dirs[i] != wxT("..") )

                         fullpath += m_dirs[i];
                         fullpath += m_dirs[i];

-                    if (i == dirCount-1)
-                        fullpath += wxT(']');
-                    else
-                        fullpath += wxT('.');

                     break;
                     break;

-                }
-                default:
-                {
-                    wxFAIL_MSG( wxT("error") );
-                }

             }
             }

+
+            if ( i != dirCount - 1 )
+                fullpath += GetPathSeparator(format);
+        }
+
+        if ( format == wxPATH_VMS )
+        {
+            fullpath += wxT(']');

         }
     }
 
         }
     }
 


@@ -1224,91 +1230,11 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {

-    format = GetFormat(format);
-
-    // first put the volume
-    wxString fullpath = wxGetVolumeString(m_volume, format);
-
-    // the leading character
-    if ( format == wxPATH_MAC )
-    {
-        if ( m_relative )
-            fullpath += wxFILE_SEP_PATH_MAC;
-    }
-    else if ( format == wxPATH_DOS )
-    {
-        if ( !m_relative )
-            fullpath += wxFILE_SEP_PATH_DOS;
-    }
-    else if ( format == wxPATH_UNIX )
-    {
-        if ( !m_relative )
-        {
-            // normally the absolute file names starts with a slash with one
-            // exception: file names like "~/foo.bar" don't have it
-            if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
-            {
-                fullpath += wxFILE_SEP_PATH_UNIX;
-            }
-        }
-    }
-
-    // then concatenate all the path components using the path separator
-    size_t dirCount = m_dirs.GetCount();
-    if ( dirCount )
-    {
-        if ( format == wxPATH_VMS )
-        {
-            fullpath += wxT('[');
-        }
-
-
-        for ( size_t i = 0; i < dirCount; i++ )
-        {
-            // TODO: What to do with ".." under VMS
+    // we already have a function to get the path
+    wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
+                                format);

 
 

-            switch (format)
-            {
-                case wxPATH_MAC:
-                {
-                    if (m_dirs[i] == wxT("."))
-                        break;
-                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
-                         fullpath += m_dirs[i];
-                    fullpath += wxT(':');
-                    break;
-                }
-                case wxPATH_DOS:
-                {
-                    fullpath += m_dirs[i];
-                    fullpath += wxT('\\');
-                    break;
-                }
-                case wxPATH_UNIX:
-                {
-                    fullpath += m_dirs[i];
-                    fullpath += wxT('/');
-                    break;
-                }
-                case wxPATH_VMS:
-                {
-                    if (m_dirs[i] != wxT(".."))  // convert back from ".." to nothing
-                        fullpath += m_dirs[i];
-                    if (i == dirCount-1)
-                        fullpath += wxT(']');
-                    else
-                        fullpath += wxT('.');
-                    break;
-                }
-                default:
-                {
-                    wxFAIL_MSG( wxT("error") );
-                }
-            }
-        }
-    }
-
-    // finally add the file name and extension
+    // now just add the file name and extension to it

     fullpath += GetFullName();
 
     return fullpath;
     fullpath += GetFullName();
 
     return fullpath;


@@ -1786,18 +1712,18 @@ static void MacEnsureDefaultExtensionsLoaded()
     MacDefaultExtensionRecord defaults[] =
     {
       { "txt" , 'TEXT' , 'ttxt' } ,
     MacDefaultExtensionRecord defaults[] =
     {
       { "txt" , 'TEXT' , 'ttxt' } ,

-      
+

     } ;
     // we could load the pc exchange prefs here too
     } ;
     // we could load the pc exchange prefs here too

-    
+

     for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
     {
       gMacDefaultExtensions.Add( defaults[i] ) ;
     for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
     {
       gMacDefaultExtensions.Add( defaults[i] ) ;

-    } 
+    }

     gMacDefaultExtensionsInited = true ;
   }
 }
     gMacDefaultExtensionsInited = true ;
   }
 }

-bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) 
+bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )

 {
   FInfo fndrInfo ;
   FSSpec spec ;
 {
   FInfo fndrInfo ;
   FSSpec spec ;


@@ -1811,7 +1737,7 @@ bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
   return true ;
 }
 
   return true ;
 }
 

-bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) 
+bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )

 {
   FInfo fndrInfo ;
   FSSpec spec ;
 {
   FInfo fndrInfo ;
   FSSpec spec ;


@@ -1835,7 +1761,7 @@ bool wxFileName::MacSetDefaultTypeAndCreator()
     return false;
 }
 
     return false;
 }
 

-bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator ) 
+bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator )

 {
   MacEnsureDefaultExtensionsLoaded() ;
   wxString extl = ext.Lower() ;
 {
   MacEnsureDefaultExtensionsLoaded() ;
   wxString extl = ext.Lower() ;