Changeset 4179

Timestamp:

Dec 15, 2007, 10:22:30 PM (13 years ago)

Author:

charles

Message:

add support for TRANSMISSION_HOME environment variable so I can have multiple copies of Transmission running concurrently in different directories.

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• platform.c (modified) (3 diffs)
• platform.h (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -89 +89 @@
     TR_MAX_SOCKETS = 512,
 
-    TR_MAX_OPEN_FILES = 8, /* real files, not sockets */
+    TR_MAX_OPEN_FILES = 16, /* real files, not sockets */
 
     TR_RESERVED_FDS = 16 /* sockets reserved for tracker connections */

trunk/libtransmission/platform.c

@@ -55 +55 @@
 #include "net.h"
 #include "platform.h"
+#include "trcompat.h"
 #include "utils.h"
 
@@ -288 +289 @@
 #endif
 
-const char *
+static const char *
 tr_getHomeDirectory( void )
 {
@@ -349 +350 @@
     static char   buf[MAX_PATH_LENGTH];
     static int    init = 0;
-    static size_t buflen = sizeof(buf);
-    const char* h;
+    const char * trhome;
 
     if( init )
         return buf;
 
-    h = tr_getHomeDirectory();
-#ifdef __BEOS__
-    find_directory( B_USER_SETTINGS_DIRECTORY,
-                    dev_for_path("/boot"), true, buf, buflen );
-    strcat( buf, "/Transmission" );
+    trhome = getenv( "TRANSMISSION_HOME" );
+    if( trhome != NULL )
+    {
+        strlcpy( buf, trhome, sizeof( buf ) );
+    }
+    else
+    {
+#ifdef __BEOS__
+        find_directory( B_USER_SETTINGS_DIRECTORY,
+                        dev_for_path("/boot"), true,
+                        buf, sizeof( buf ) );
+        strcat( buf, "/Transmission" );
 #elif defined( SYS_DARWIN )
-    tr_buildPath ( buf, buflen, h,
-                  "Library", "Application Support", "Transmission", NULL );
+        const char * h = tr_getHomeDirectory( );
+        tr_buildPath ( buf, sizeof( buf ),
+                       tr_getHomeDirectory( ),
+                       "Library",
+                       "Application Support",
+                       "Transmission",
+                       NULL );
 #elif defined(__AMIGAOS4__)
-    snprintf( buf, buflen, "PROGDIR:.transmission" );
-#elif defined(WIN32)
-    {
-        char tmp[MAX_PATH_LENGTH];
-        SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, tmp );
-        tr_buildPath( buf, sizeof(buf), tmp, "Transmission", NULL );
-        buflen = strlen( buf );
+        strlcpy( buf, "PROGDIR:.transmission", sizeof( buf ) );
+#elif defined(WIN32)
+        char appdata[MAX_PATH_LENGTH];
+        SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
+        tr_buildPath( buf, sizeof(buf),
+                      appdata,
+                      "Transmission",
+                      NULL );
+#else
+        tr_buildPath ( buf, sizeof(buf), tr_getHomeDirectory( ), ".transmission", NULL );
+#endif
     }
-#else
-    tr_buildPath ( buf, buflen, h, ".transmission", NULL );
-#endif
 
     tr_mkdirp( buf, 0777 );

trunk/libtransmission/platform.h

@@ -28 +28 @@
 typedef struct tr_thread tr_thread;
 
-const char * tr_getHomeDirectory( void );
 const char * tr_getCacheDirectory( void );
 const char * tr_getTorrentsDirectory( void );