Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index f3c5b3e6819321845e8cf0cafd58f79ac29d4ebc..cbefbd864de119d18259e7e3c39acffabbb2ba2f 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -240,18 +240,18 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
     // Check if the file is owned by current user and has 0600 permissions.
     // If it doesn't, it's a fake file, possibly meant as a DoS attack, and
     // so we refuse to touch it:
-    wxStructStat stat;
-    if ( wxStat(name, &stat) != 0 )
+    wxStructStat stats;
+    if ( wxStat(name, &stats) != 0 )
     {
         wxLogSysError(_("Failed to inspect the lock file '%s'"), name.c_str());
         return false;
     }
-    if ( stat.st_uid != getuid() )
+    if ( stats.st_uid != getuid() )
     {
         wxLogError(_("Lock file '%s' has incorrect owner."), name.c_str());
         return false;
     }
-    if ( stat.st_mode != (S_IFREG | S_IRUSR | S_IWUSR) )
+    if ( stats.st_mode != (S_IFREG | S_IRUSR | S_IWUSR) )
     {
         wxLogError(_("Lock file '%s' has incorrect permissions."), name.c_str());
         return false;
@@ -277,7 +277,7 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
     }
 
     char buf[256];
-    off_t count = file.Read(buf, WXSIZEOF(buf));
+    ssize_t count = file.Read(buf, WXSIZEOF(buf));
     if ( count == wxInvalidOffset )
     {
         wxLogError(_("Failed to read PID from lock file."));