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 7a5340f90d6b9af983dc52b9fb3edec4422d106f..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


@@ -246,6 +246,8 @@ static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
 
     if ( !volume.empty() )
     {
 
     if ( !volume.empty() )
     {

+        format = wxFileName::GetFormat(format);
+

         // Special Windows UNC paths hack, part 2: undo what we did in
         // SplitPath() and make an UNC path if we have a drive which is not a
         // single letter (hopefully the network shares can't be one letter only
         // Special Windows UNC paths hack, part 2: undo what we did in
         // SplitPath() and make an UNC path if we have a drive which is not a
         // single letter (hopefully the network shares can't be one letter only


@@ -413,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__
 


@@ -735,47 +737,48 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
 // directory operations
 // ----------------------------------------------------------------------------
 
 // directory operations
 // ----------------------------------------------------------------------------
 

-bool wxFileName::Mkdir( int perm, bool full )
+bool wxFileName::Mkdir( int perm, int flags )

 {
 {

-    return wxFileName::Mkdir( GetFullPath(), perm, full );
+    return wxFileName::Mkdir( GetFullPath(), perm, flags );

 }
 
 }
 

-bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )
+bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )

 {
 {

-    if (full)
+    if ( flags & wxPATH_MKDIR_FULL )

     {
     {

-        wxFileName filename(dir);
-        wxArrayString dirs = filename.GetDirs();
-        dirs.Add(filename.GetName());
+        // split the path in components
+        wxFileName filename;
+        filename.AssignDir(dir);

 
 

-        size_t count = dirs.GetCount();
-        size_t i;

         wxString currPath;
         wxString currPath;

-        int noErrors = 0;
-        for ( i = 0; i < count; i++ )
+        if ( filename.HasVolume())

         {
         {

-            currPath += dirs[i];
+            currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);
+        }

 
 

-            if (currPath.Last() == wxT(':'))
-            {
-                // Can't create a root directory so continue to next dir
+        wxArrayString dirs = filename.GetDirs();
+        size_t count = dirs.GetCount();
+        for ( size_t i = 0; i < count; i++ )
+        {
+            if ( i > 0 || filename.IsAbsolute() )

                 currPath += wxFILE_SEP_PATH;
                 currPath += wxFILE_SEP_PATH;

-                continue;
-            }
+            currPath += dirs[i];

 
             if (!DirExists(currPath))
 
             if (!DirExists(currPath))

+            {

                 if (!wxMkdir(currPath, perm))
                 if (!wxMkdir(currPath, perm))

-                    noErrors ++;
-
-            if ( (i < (count-1)) )
-                currPath += wxFILE_SEP_PATH;
+                {
+                    // no need to try creating further directories
+                    return FALSE;
+                }
+            }

         }
 
         }
 

-        return (noErrors == 0);
+        return TRUE;

 
     }
 
     }

-    else
-        return ::wxMkdir( dir, perm );
+
+    return ::wxMkdir( dir, perm );

 }
 
 bool wxFileName::Rmdir()
 }
 
 bool wxFileName::Rmdir()


@@ -988,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;


@@ -1153,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


@@ -1168,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(']');

         }
     }
 
         }
     }
 


@@ -1221,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);
+    // we already have a function to get the path
+    wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
+                                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
-
-            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;


@@ -1348,7 +1277,7 @@ wxString wxFileName::GetLongPath() const
     bool success = FALSE;
 
 #if wxUSE_DYNAMIC_LOADER
     bool success = FALSE;
 
 #if wxUSE_DYNAMIC_LOADER

-    typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+    typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);

 
     static bool s_triedToLoad = FALSE;
 
 
     static bool s_triedToLoad = FALSE;
 


@@ -1783,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 ;


@@ -1808,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 ;


@@ -1832,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() ;