Make wxFILE_EXISTS_SYMLINK work on its own, without wxFILE_EXISTS_NO_FOLLOW.

Include the wxFILE_EXISTS_NO_FOLLOW bit in wxFILE_EXISTS_SYMLINK definition to
allow using just wxFileName::Exists(wxFILE_EXISTS_SYMLINK) which used to never
work because the link was followed.

Closes #14777.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 967077393fecda063156e340ff54a813b8be2a8c..f580d1d49429417761aa830709aa9b746898c62a 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -113,13 +113,15 @@ enum
 {
     wxFILE_EXISTS_REGULAR   = 0x0001,  // check for existence of a regular file
     wxFILE_EXISTS_DIR       = 0x0002,  // check for existence of a directory
-    wxFILE_EXISTS_SYMLINK   = 0x0004,  // check for existence of a symbolic link
+    wxFILE_EXISTS_SYMLINK   = 0x1004,  // check for existence of a symbolic link;
+                                       // also sets wxFILE_EXISTS_NO_FOLLOW as
+                                       // it would never be satisfied otherwise
     wxFILE_EXISTS_DEVICE    = 0x0008,  // check for existence of a device
     wxFILE_EXISTS_FIFO      = 0x0016,  // check for existence of a FIFO
     wxFILE_EXISTS_SOCKET    = 0x0032,  // check for existence of a socket
                                        // gap for future types
-    wxFILE_EXISTS_ANY       = 0x0FFF,  // check for existence of anything
-    wxFILE_EXISTS_NO_FOLLOW = 0x1000   // don't dereference a contained symlink
+    wxFILE_EXISTS_NO_FOLLOW = 0x1000,  // don't dereference a contained symlink
+    wxFILE_EXISTS_ANY       = 0x1FFF   // check for existence of anything
 };
 
 #if wxUSE_LONGLONG

diff --git a/interface/wx/filename.h b/interface/wx/filename.h
index 3622c768997274aafd9c0aaada690d53979b96f5..c7360e86948c41dcc24a9ddcaadad4295fc802ed 100644 (file)
--- a/interface/wx/filename.h
+++ b/interface/wx/filename.h
@@ -102,18 +102,16 @@ enum
     /**
         Check for existence of a symlink.
 
-        Notice that this flag should be used either with
-        ::wxFILE_EXISTS_NO_FOLLOW or with a wxFileName object on which
-        wxFileName::DontFollowLink() had been called, otherwise it would never
-        be satisfied as wxFileName::Exists() would be checking for the
-        existence of the symlink target and not the symlink itself.
+        Notice that this flag also sets ::wxFILE_EXISTS_NO_FOLLOW, otherwise it
+        would never be satisfied as wxFileName::Exists() would be checking for
+        the existence of the symlink target and not the symlink itself.
      */
-    wxFILE_EXISTS_SYMLINK   = 0x0004,
+    wxFILE_EXISTS_SYMLINK   = 0x1004,
     wxFILE_EXISTS_DEVICE    = 0x0008,  //!< Check for existence of a device
     wxFILE_EXISTS_FIFO      = 0x0016,  //!< Check for existence of a FIFO
     wxFILE_EXISTS_SOCKET    = 0x0032,  //!< Check for existence of a socket
-    wxFILE_EXISTS_ANY       = 0x0FFF,  //!< Check for existence of anything
     wxFILE_EXISTS_NO_FOLLOW = 0x1000   //!< Don't dereference a contained symbolic link
+    wxFILE_EXISTS_ANY       = 0x1FFF,  //!< Check for existence of anything
 };
 
 /**

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 31251fcdcb73a3e4dab2ea91acb12ce1486baca6..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) )
-        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) )
@@ -1422,8 +1427,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
             // 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 |
-                                         wxFILE_EXISTS_NO_FOLLOW) )
+            if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK) )
             {
                 return wxRemoveFile(dir);
             }

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index c975cfc363f72aa59fadca628ad1ac09e646686b..a9d2396d19d95952dc10e702876e3eb6581286f6 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -698,9 +698,8 @@ void FileNameTestCase::TestExists()
     CPPUNIT_ASSERT( wxFileName::Exists("/dev/null", wxFILE_EXISTS_DEVICE) );
 #ifdef __LINUX__
     // These files are only guaranteed to exist under Linux.
-    CPPUNIT_ASSERT( !wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) );
-    CPPUNIT_ASSERT( wxFileName::Exists("/dev/core",
-                    wxFILE_EXISTS_SYMLINK | wxFILE_EXISTS_NO_FOLLOW) );
+    // No need for wxFILE_EXISTS_NO_FOLLOW here; wxFILE_EXISTS_SYMLINK implies it
+    CPPUNIT_ASSERT( wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) );
     CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) );
 #endif // __LINUX__
     wxString fifo = dirTemp.GetPath() + "/fifo";
@@ -923,7 +922,15 @@ void FileNameTestCase::TestSymlinks()
 
     // Finally test Exists() after removing the file.
     CPPUNIT_ASSERT(wxRemoveFile(targetfn.GetFullPath()));
-    CPPUNIT_ASSERT(!wxFileName(tempdir, "linktofile").Exists());
+    // This should succeed, as the symlink still exists and
+    // the default wxFILE_EXISTS_ANY implies wxFILE_EXISTS_NO_FOLLOW
+    CPPUNIT_ASSERT(wxFileName(tempdir, "linktofile").Exists());
+    // So should this one, as wxFILE_EXISTS_SYMLINK does too
+    CPPUNIT_ASSERT(wxFileName(tempdir, "linktofile").
+                                            Exists(wxFILE_EXISTS_SYMLINK));
+    // but not this one, as the now broken symlink is followed
+    CPPUNIT_ASSERT(!wxFileName(tempdir, "linktofile").
+                                            Exists(wxFILE_EXISTS_REGULAR));
     CPPUNIT_ASSERT(linktofile.Exists());
 
     // This is also a convenient place to test Rmdir() as we have things to