applied patch 890642: wxRE_ADVANCED flag and docs

[wxWidgets.git] / src / unix / snglinst.cpp

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index d29268bbd3d9b096be9458448907a9c45aa0ad91..df4971de418091356f281f4087d7f64b5eff37e5 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -7,7 +7,7 @@
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "snglinst.h"
 #endif
 
     #pragma implementation "snglinst.h"
 #endif
 


@@ -35,9 +35,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/file.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/file.h"

 #include "wx/utils.h"           // wxGetHomeDir()
 
 #include "wx/snglinst.h"
 #include "wx/utils.h"           // wxGetHomeDir()
 
 #include "wx/snglinst.h"


@@ -151,15 +151,14 @@ private:
 LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file
 LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
 {
     // try to open the file

-    m_fdLock = open(m_nameLock,
+    m_fdLock = open(m_nameLock.fn_str(),

                     O_WRONLY | O_CREAT | O_EXCL,
                     S_IRUSR | S_IWUSR);
 
     if ( m_fdLock != -1 )
     {
         // try to lock it
                     O_WRONLY | O_CREAT | O_EXCL,
                     S_IRUSR | S_IWUSR);
 
     if ( m_fdLock != -1 )
     {
         // try to lock it

-        int rc = wxLockFile(m_fdLock, LOCK);
-        if ( rc == 0 )
+        if ( wxLockFile(m_fdLock, LOCK) == 0 )

         {
             // fine, we have the exclusive lock to the file, write our PID
             // into it
         {
             // fine, we have the exclusive lock to the file, write our PID
             // into it


@@ -188,12 +187,12 @@ LockResult wxSingleInstanceCheckerImpl::CreateLockFile()
             close(m_fdLock);
             m_fdLock = -1;
 
             close(m_fdLock);
             m_fdLock = -1;
 

-            if ( rc != EACCES && rc != EAGAIN )
+            if ( errno != EACCES && errno != EAGAIN )

             {
                 wxLogSysError(_("Failed to lock the lock file '%s'"),
                               m_nameLock.c_str());
 
             {
                 wxLogSysError(_("Failed to lock the lock file '%s'"),
                               m_nameLock.c_str());
 

-                unlink(m_nameLock);
+                unlink(m_nameLock.fn_str());

 
                 return LOCK_ERROR;
             }
 
                 return LOCK_ERROR;
             }


@@ -258,7 +257,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {
         {
             if ( kill(m_pidLocker, 0) != 0 )
             {

-                if ( unlink(name) != 0 )
+                if ( unlink(name.fn_str()) != 0 )

                 {
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());
                 {
                     wxLogError(_("Failed to remove stale lock file '%s'."),
                                name.c_str());


@@ -292,7 +291,7 @@ void wxSingleInstanceCheckerImpl::Unlock()
 {
     if ( m_fdLock != -1 )
     {
 {
     if ( m_fdLock != -1 )
     {

-        if ( unlink(m_nameLock) != 0 )
+        if ( unlink(m_nameLock.fn_str()) != 0 )

         {
             wxLogSysError(_("Failed to remove lock file '%s'"),
                           m_nameLock.c_str());
         {
             wxLogSysError(_("Failed to remove lock file '%s'"),
                           m_nameLock.c_str());


@@ -332,7 +331,12 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
     wxString fullname = path;
     if ( fullname.empty() )
     {
     wxString fullname = path;
     if ( fullname.empty() )
     {

-        fullname << wxGetHomeDir() << _T('/');
+        fullname = wxGetHomeDir();
+    }
+
+    if ( fullname.Last() != _T('/') )
+    {
+        fullname += _T('/');

     }
 
     fullname << name;
     }
 
     fullname << name;