Add missing WXK constants for the control keys

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 47cd363d88b74c94107ed02260eaaa90fef24384..17f40be930ea55bdb1bd41436d2e4ecafbbc3f28 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -737,7 +737,12 @@ wxFileSystemObjectExists(const wxString& path, int flags)
     if ( S_ISDIR(st.st_mode) )
         return acceptDir;
     if ( S_ISLNK(st.st_mode) )
     if ( S_ISDIR(st.st_mode) )
         return acceptDir;
     if ( S_ISLNK(st.st_mode) )

-        return (flags & wxFILE_EXISTS_SYMLINK) != 0;
+    {
+        // Take care to not test for "!= 0" here as this would erroneously
+        // return true if only wxFILE_EXISTS_NO_FOLLOW, which is part of
+        // wxFILE_EXISTS_SYMLINK, is set too.
+        return (flags & wxFILE_EXISTS_SYMLINK) == wxFILE_EXISTS_SYMLINK;
+    }

     if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) )
         return (flags & wxFILE_EXISTS_DEVICE) != 0;
     if ( S_ISFIFO(st.st_mode) )
     if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) )
         return (flags & wxFILE_EXISTS_DEVICE) != 0;
     if ( S_ISFIFO(st.st_mode) )


@@ -772,7 +777,7 @@ bool wxFileName::DirExists() const
     if ( !ShouldFollowLink() )
         flags |= wxFILE_EXISTS_NO_FOLLOW;
 
     if ( !ShouldFollowLink() )
         flags |= wxFILE_EXISTS_NO_FOLLOW;
 

-    return Exists(GetFullPath(), flags);
+    return Exists(GetPath(), flags);

 }
 
 /* static */
 }
 
 /* static */


@@ -1415,6 +1420,20 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
     if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE
 #endif // !__WINDOWS__
     {
     if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE
 #endif // !__WINDOWS__
     {

+#ifndef __WINDOWS__
+        if ( flags & wxPATH_RMDIR_RECURSIVE )
+        {
+            // When deleting the tree recursively, we are supposed to delete
+            // this directory itself even when it is a symlink -- but without
+            // following it. Do it here as wxRmdir() would simply follow if
+            // called for a symlink.
+            if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK) )
+            {
+                return wxRemoveFile(dir);
+            }
+        }
+#endif // !__WINDOWS__
+

         wxString path(dir);
         if ( path.Last() != wxFILE_SEP_PATH )
             path += wxFILE_SEP_PATH;
         wxString path(dir);
         if ( path.Last() != wxFILE_SEP_PATH )
             path += wxFILE_SEP_PATH;


@@ -1426,8 +1445,11 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
 
         wxString filename;
 
 
         wxString filename;
 

-        // first delete all subdirectories
-        bool cont = d.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
+        // First delete all subdirectories: notice that we don't follow
+        // symbolic links, potentially leading outside this directory, to avoid
+        // unpleasant surprises.
+        bool cont = d.GetFirst(&filename, wxString(),
+                               wxDIR_DIRS | wxDIR_HIDDEN | wxDIR_NO_FOLLOW);

         while ( cont )
         {
             wxFileName::Rmdir(path + filename, flags);
         while ( cont )
         {
             wxFileName::Rmdir(path + filename, flags);


@@ -1437,8 +1459,11 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
 #ifndef __WINDOWS__
         if ( flags & wxPATH_RMDIR_RECURSIVE )
         {
 #ifndef __WINDOWS__
         if ( flags & wxPATH_RMDIR_RECURSIVE )
         {

-            // delete all files too
-            cont = d.GetFirst(&filename, "", wxDIR_FILES | wxDIR_HIDDEN);
+            // Delete all files too and, for the same reasons as above, don't
+            // follow symlinks which could refer to the files outside of this
+            // directory and just delete the symlinks themselves.
+            cont = d.GetFirst(&filename, wxString(),
+                              wxDIR_FILES | wxDIR_HIDDEN | wxDIR_NO_FOLLOW);

             while ( cont )
             {
                 ::wxRemoveFile(path + filename);
             while ( cont )
             {
                 ::wxRemoveFile(path + filename);