some fixes to wxSingleInstanceChecker error reporting

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index e0349bfee7c570aaab3bab0f62287aefebff542d..9db3141247201196af7574c1566d4d46279000b5 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -4562,17 +4562,24 @@ int main(int argc, char **argv)
     }
 
 #ifdef TEST_SNGLINST
-    wxSingleInstanceChecker checker(_T(".wxconsole.lock"));
-    if ( checker.IsAnotherRunning() )
+    wxSingleInstanceChecker checker;
+    if ( checker.Create(_T(".wxconsole.lock")) )
     {
-        wxPrintf(_T("Another instance of the program is running, exiting.\n"));
+        if ( checker.IsAnotherRunning() )
+        {
+            wxPrintf(_T("Another instance of the program is running, exiting.\n"));
 
-        return 1;
-    }
+            return 1;
+        }
 
-    // wait some time to give time to launch another instance
-    wxPrintf(_T("Press \"Enter\" to continue..."));
-    wxFgetc(stdin);
+        // wait some time to give time to launch another instance
+        wxPrintf(_T("Press \"Enter\" to continue..."));
+        wxFgetc(stdin);
+    }
+    else // failed to create
+    {
+        wxPrintf(_T("Failed to init wxSingleInstanceChecker.\n"));
+    }
 #endif // TEST_SNGLINST
 
 #ifdef TEST_CHARSET

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index 8b569946b165579cd9332fea966fc06ad57a2678..80bf0d1629b17ad763bd1b9880547075efb2b4d1 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -46,6 +46,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>             // for kill()
+#include <errno.h>
 
 #ifdef HAVE_FCNTL
     #include <fcntl.h>
@@ -57,15 +58,28 @@
 #endif // fcntl()/flock()
 
 // ----------------------------------------------------------------------------
-// private functions: (exclusively) lock/unlock the file
+// constants
 // ----------------------------------------------------------------------------
 
+// argument of wxLockFile()
 enum LockOperation
 {
     LOCK,
     UNLOCK
 };
 
+// return value of CreateLockFile()
+enum LockResult
+{
+    LOCK_ERROR = -1,
+    LOCK_EXISTS,
+    LOCK_CREATED
+};
+
+// ----------------------------------------------------------------------------
+// private functions: (exclusively) lock/unlock the file
+// ----------------------------------------------------------------------------
+
 #ifdef HAVE_FCNTL
 
 static int wxLockFile(int fd, LockOperation lock)
@@ -115,7 +129,7 @@ public:
 
 private:
     // try to create and lock the file
-    bool CreateLockFile();
+    LockResult CreateLockFile();
 
     // unlock and remove the lock file
     void Unlock();
@@ -134,7 +148,7 @@ private:
 // wxSingleInstanceCheckerImpl implementation
 // ============================================================================
 
-bool wxSingleInstanceCheckerImpl::CreateLockFile()
+LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file
     m_fdLock = open(m_nameLock,
@@ -144,7 +158,8 @@ bool wxSingleInstanceCheckerImpl::CreateLockFile()
     if ( m_fdLock != -1 )
     {
         // try to lock it
-        if ( wxLockFile(m_fdLock, LOCK) == 0 )
+        int rc = wxLockFile(m_fdLock, LOCK);
+        if ( rc == 0 )
         {
             // fine, we have the exclusive lock to the file, write our PID
             // into it
@@ -161,33 +176,55 @@ bool wxSingleInstanceCheckerImpl::CreateLockFile()
 
                 Unlock();
 
-                return FALSE;
+                return LOCK_ERROR;
             }
 
             fsync(m_fdLock);
 
-            return TRUE;
+            return LOCK_CREATED;
         }
+        else // failure: see what exactly happened
+        {
+            close(m_fdLock);
+            m_fdLock = -1;
 
-        // couldn't lock: this might have happened because of a race
-        // condition: maybe another instance opened and locked the file
-        // between our calls to open() and flock()
-        close(m_fdLock);
-        m_fdLock = -1;
+            if ( rc != EACCES && rc != EAGAIN )
+            {
+                wxLogSysError(_("Failed to lock the lock file '%s'"),
+                              m_nameLock.c_str());
+
+                unlink(m_nameLock);
+
+                return LOCK_ERROR;
+            }
+            //else: couldn't lock because the lock is held by another process:
+            //      this might have happened because of a race condition:
+            //      maybe another instance opened and locked the file between
+            //      our calls to open() and flock(), so don't give an error
+        }
     }
 
     // we didn't create and lock the file
-    return FALSE;
+    return LOCK_EXISTS;
 }
 
 bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
 {
     m_nameLock = name;
 
-    if ( CreateLockFile() )
+    switch ( CreateLockFile() )
     {
-        // nothing more to do
-        return TRUE;
+        case LOCK_EXISTS:
+            // there is a lock file, check below if it is still valid
+            break;
+
+        case LOCK_CREATED:
+            // nothing more to do
+            return TRUE;
+
+        case LOCK_ERROR:
+            // oops...
+            return FALSE;
     }
 
     // try to open the file for reading and get the PID of the process
@@ -241,7 +278,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         }
         else
         {
-            wxLogWarning(_("Invalid lock file '%s'."));
+            wxLogWarning(_("Invalid lock file '%s'."), name.c_str());
         }
     }