Changeset 5167 for trunk/gtk/conf.c

Timestamp:

Feb 28, 2008, 7:06:23 PM (14 years ago)

Author:

charles

Message:

add win32/posix wrapper function tr_lockfile() to libT and use it in daemon/gtk.

File:

• trunk/gtk/conf.c (modified) (4 diffs)

trunk/gtk/conf.c

@@ -29 +29 @@
 #include <string.h>
 
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
@@ -40 +37 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
+#include <libtransmission/platform.h>
 
 #include "conf.h"
@@ -73 +71 @@
 
 /* errstr may be NULL, this might be called before GTK is initialized */
-static int
-lockfile(const char *file, char **errstr)
-{
-    int fd;
-    struct flock lk;
-
-    if( errstr )
-        *errstr = NULL;
-
-    fd = open( file, O_RDWR | O_CREAT, 0666 );
-    if( fd < 0 )
-    { 
-        const int savederr = errno;
-        if( errstr )
-            *errstr = g_strdup_printf(
-                          _("Failed to open the file %s for writing:\n%s"),
-                          file, g_strerror( errno ) );
-        errno = savederr;
-        return -1;
-    }
-
-    memset( &lk, 0,  sizeof( lk ) );
-    lk.l_start = 0;
-    lk.l_len = 0;
-    lk.l_type = F_WRLCK;
-    lk.l_whence = SEEK_SET;
-    if( -1 == fcntl( fd, F_SETLK, &lk ) )
-    {
-        const int savederr = errno;
-        if( errstr )
-            *errstr = ( errno == EAGAIN )
-                ? g_strdup_printf( _( "Another copy of %s is already running." ),
-                                   g_get_application_name( ) )
-                : g_strdup_printf( _( "Failed to lock the file %s:\n%s" ),
-                                  file, g_strerror( errno ) );
-        close( fd );
-        errno = savederr;
-        return -1;
-    }
-
-    return fd;
+static gboolean
+lockfile(const char * filename, char **errstr)
+{
+    const int state = tr_lockfile( filename );
+    const gboolean success = state == TR_LOCKFILE_SUCCESS;
+
+    if( errstr ) switch( state ) {
+        case TR_LOCKFILE_EOPEN:
+            *errstr = g_strdup_printf( _("Failed to open lockfile %s: %s"),
+                                       filename, g_strerror( errno ) );
+            break;
+        case TR_LOCKFILE_ELOCK:
+            *errstr = g_strdup_printf( _( "%s is already running." ),
+                                       g_get_application_name( ) );
+            break;
+        case TR_LOCKFILE_SUCCESS:
+            *errstr = NULL;
+            break;
+    }
+
+    return success;
 }
 
@@ -135 +113 @@
 {
     char * path = getLockFilename( );
-    int fd = lockfile( path, errstr );
-    if( fd >= 0 )
+    const gboolean didLock = lockfile( path, errstr );
+    if( didLock )
         gl_lockpath = g_strdup( path );
     g_atexit( cf_removelocks );
     g_free( path );
-    return fd >= 0;
+    return didLock;
 }