Changeset 5167 for trunk/daemon/daemon.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/daemon/daemon.c (modified) (8 diffs)

trunk/daemon/daemon.c

@@ -33 +33 @@
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
@@ -43 +42 @@
 
 #include <libtransmission/trcompat.h>
+#include <libtransmission/platform.h>
 #include <libtransmission/version.h>
 
@@ -53 +53 @@
 static void readargs    ( int, char **, int *, int *, char **, char ** );
 static int  trylocksock ( const char * );
-static int  getlock     ( const char * );
 static int  getsock     ( const char * );
 static void exitcleanup ( void );
@@ -60 +59 @@
 static int  savepid     ( const char * );
 
-static int  gl_lockfd               = -1;
 static char gl_lockpath[MAXPATHLEN] = "";
 static int  gl_sockfd               = -1;
@@ -184 +182 @@
 }
 
+static int
+getlock( const char * filename )
+{
+    const int state = tr_lockfile( filename );
+    const int success = state == TR_LOCKFILE_SUCCESS;
+
+    if( !success ) switch( state ) {
+        case TR_LOCKFILE_EOPEN:
+            errnomsg( "failed to open file: %s", filename );
+            break;
+        case TR_LOCKFILE_ELOCK:
+            errmsg( "another copy of %s is already running", getmyname() );
+            break;
+        default:
+            errmsg( "unhandled tr_lockfile error: %d", state );
+            break;
+    }
+
+    return success;
+}
+
+
 int
 trylocksock( const char * sockpath )
@@ -198 +218 @@
 
     confpath( path, sizeof path, CONF_FILE_LOCK, 0 );
-    fd = getlock( path );
-    if( 0 > fd )
-    {
-        return -1;
-    }
-    gl_lockfd = fd;
+    if( !getlock( path ) )
+        return -1;
     strlcpy( gl_lockpath, path, sizeof gl_lockpath );
 
@@ -218 +234 @@
     gl_sockfd = fd;
     strlcpy( gl_sockpath, sockpath, sizeof gl_sockpath );
-
-    return fd;
-}
-
-int
-getlock( const char * path )
-{
-    struct flock lk;
-    int          fd;
-    char         pid[64];
-
-    fd = open( path, O_RDWR | O_CREAT, 0666 );
-    if( 0 > fd )
-    {
-        errnomsg( "failed to open file: %s", path );
-        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( 0 > fcntl( fd, F_SETLK, &lk ) )
-    {
-        if( EAGAIN == errno )
-        {
-            errmsg( "another copy of %s is already running", getmyname() );
-        }
-        else
-        {
-            errnomsg( "failed to obtain lock on file: %s", path );
-        }
-        close( fd );
-        return -1;
-    }
-
-    ftruncate( fd, 0 );
-    snprintf( pid, sizeof pid, "%i\n", getpid() );
-    write( fd, pid, strlen( pid ) );
 
     return fd;
@@ -306 +282 @@
         unlink( gl_pidfile );
     }
-    if( 0 <= gl_lockfd )
-    {
+
+    if( *gl_lockpath )
         unlink( gl_lockpath );
-        close( gl_lockfd );
-    }
 }