Changeset 6896

Timestamp:

Oct 14, 2008, 3:03:29 AM (13 years ago)

Author:

charles

Message:

have tr_buildPath() allocate memory from the heap rather than using an input buffer

Location:

trunk

Files:

• daemon/daemon.c (modified) (3 diffs)
• daemon/remote.c (modified) (3 diffs)
• libtransmission/fastresume.c (modified) (8 diffs)
• libtransmission/fdlimit.c (modified) (8 diffs)
• libtransmission/inout.c (modified) (2 diffs)
• libtransmission/makemeta.c (modified) (3 diffs)
• libtransmission/platform.c (modified) (12 diffs)
• libtransmission/session.c (modified) (11 diffs)
• libtransmission/stats.c (modified) (4 diffs)
• libtransmission/torrent.c (modified) (3 diffs)
• libtransmission/utils.c (modified) (2 diffs)
• libtransmission/utils.h (modified) (1 diff)
• libtransmission/verify.c (modified) (2 diffs)

trunk/daemon/daemon.c

@@ -32 +32 @@
 static int         closing = FALSE;
 static tr_handle * mySession;
-static char        myConfigFilename[MAX_PATH_LENGTH];
+static char      * myConfigFilename = NULL;
 
 #define KEY_BLOCKLIST         "blocklist-enabled"
@@ -478 +478 @@
               &rpcPort, &whitelist, &authRequired, &username, &password,
               &blocklistEnabled );
-    if( configDir == NULL )
+    if( configDir )
         configDir = freeme = tr_strdup_printf( "%s-daemon",
                                               tr_getDefaultConfigDir( ) );
-    tr_buildPath( myConfigFilename, sizeof( myConfigFilename ),
-                  configDir, CONFIG_FILE, NULL );
+    myConfigFilename = tr_buildPath( configDir, CONFIG_FILE, NULL );
 
     if( !nofork )
@@ -506 +505 @@
 
     tr_free( freeme );
+    tr_free( myConfigFilename );
     return 0;
 }

trunk/daemon/remote.c

@@ -145 +145 @@
 
 static char*
-absolutify( char *       buf,
-            size_t       len,
-            const char * path )
-{
+absolutify( const char * path )
+{
+    char * buf;
+
     if( *path == '/' )
-        tr_strlcpy( buf, path, len );
-    else
-    {
+        buf = tr_strdup( path );
+    else {
         char cwd[MAX_PATH_LENGTH];
         tr_getcwd( cwd, sizeof( cwd ) );
-        tr_buildPath( buf, len, cwd, path, NULL );
-    }
+        buf = tr_buildPath( cwd, path, NULL );
+    }
+
     return buf;
 }
@@ -273 +273 @@
     {
         int     i, n;
-        char    buf[MAX_PATH_LENGTH];
         int     addArg = TRUE;
         tr_benc top, *args, *fields;
@@ -422 +421 @@
                 break;
 
-            case 'w':
-                tr_bencDictAddStr( &top, "method", "session-set" );
-                tr_bencDictAddStr( args, "download-dir",
-                                  absolutify( buf, sizeof( buf ), optarg ) );
-                break;
+            case 'w': {
+                char * path = absolutify( optarg );
+                tr_bencDictAddStr( &top, "method", "session-set" );
+                tr_bencDictAddStr( args, "download-dir", path );
+                tr_free( path );
+                break;
+            }
 
             case 'x':

trunk/libtransmission/fastresume.c

@@ -122 +122 @@
 #define FR_SPEED_LEN ( 2 * ( sizeof( uint16_t ) + sizeof( uint8_t ) ) )
 
-#if 0
-static void
-fastResumeFileName( char *             buf,
-                    size_t             buflen,
-                    const tr_torrent * tor,
-                    int                tag )
-{
-    const char * cacheDir = tr_getResumeDir( tor->handle );
-    const char * hash = tor->info.hashString;
-
-    if( !tag )
-    {
-        tr_buildPath( buf, buflen, cacheDir, hash, NULL );
-    }
-    else
-    {
-        char base[1024];
-        tr_snprintf( base, sizeof( base ), "%s-%s", hash, tor->handle->tag );
-        tr_buildPath( buf, buflen, cacheDir, base, NULL );
-    }
-}
-
-#endif
-
 static tr_time_t*
 getMTimes( const tr_torrent * tor,
@@ -156 +132 @@
     for( i = 0; i < n; ++i )
     {
-        char        fname[MAX_PATH_LENGTH];
         struct stat sb;
-        tr_buildPath( fname, sizeof( fname ),
-                      tor->downloadDir, tor->info.files[i].name, NULL );
+        char * fname = tr_buildPath( tor->downloadDir, tor->info.files[i].name, NULL );
         if( !stat( fname, &sb ) && S_ISREG( sb.st_mode ) )
         {
@@ -168 +142 @@
 #endif
         }
+        tr_free( fname );
     }
 
@@ -173 +148 @@
     return m;
 }
-
-#if 0
-static void
-fastResumeWriteData( uint8_t      id,
-                     const void * data,
-                     uint32_t     size,
-                     uint32_t     count,
-                     FILE *       file )
-{
-    uint32_t datalen = size * count;
-
-    fwrite( &id, 1, 1, file );
-    fwrite( &datalen, 4, 1, file );
-    fwrite( data, size, count, file );
-}
-
-void
-tr_fastResumeSave( const tr_torrent * tor )
-{
-    char      path[MAX_PATH_LENGTH];
-    FILE *    file;
-    const int version = 1;
-    uint64_t  total;
-
-    fastResumeFileName( path, sizeof path, tor, 1 );
-    file = fopen( path, "wb+" );
-    if( !file )
-    {
-        tr_torerr( tor, _(
-                      "Couldn't open \"%1$s\": %2$s" ), path,
-                  tr_strerror( errno ) );
-        return;
-    }
-
-    /* Write format version */
-    fwrite( &version, 4, 1, file );
-
-    if( TRUE ) /* FR_ID_DOWNLOAD_DIR */
-    {
-        const char * d = tor->downloadDir ? tor->downloadDir : "";
-        const int    byteCount = strlen( d ) + 1;
-        fastResumeWriteData( FR_ID_DOWNLOAD_DIR, d, 1, byteCount, file );
-    }
-
-    /* Write progress data */
-    {
-        int                 i, n;
-        tr_time_t *         mtimes;
-        uint8_t *           buf = malloc( FR_PROGRESS_LEN( tor ) );
-        uint8_t *           walk = buf;
-        const tr_bitfield * bitfield;
-
-        /* mtimes */
-        mtimes = getMTimes( tor, &n );
-        for( i = 0; i < n; ++i )
-            if( !tr_torrentIsFileChecked( tor, i ) )
-                mtimes[i] = ~(tr_time_t)0; /* force a recheck next time */
-        memcpy( walk, mtimes, n * sizeof( tr_time_t ) );
-        walk += n * sizeof( tr_time_t );
-
-        /* completion bitfield */
-        bitfield = tr_cpBlockBitfield( tor->completion );
-        assert( (unsigned)FR_BLOCK_BITFIELD_LEN( tor ) == bitfield->len );
-        memcpy( walk, bitfield->bits, bitfield->len );
-        walk += bitfield->len;
-
-        /* write it */
-        assert( walk - buf == (int)FR_PROGRESS_LEN( tor ) );
-        fastResumeWriteData( FR_ID_PROGRESS, buf, 1, walk - buf, file );
-
-        /* cleanup */
-        free( mtimes );
-        free( buf );
-    }
-
-
-    /* Write the priorities and DND flags */
-    if( TRUE )
-    {
-        int       i;
-        const int n = tor->info.fileCount;
-        char *    buf = tr_new0( char, n * 2 );
-        char *    walk = buf;
-
-        /* priorities */
-        for( i = 0; i < n; ++i )
-        {
-            char      ch;
-            const int priority = tor->info.files[i].priority;
-            switch( priority )
-            {
-                case TR_PRI_LOW:
-                    ch = 'l'; break;              /* low */
-
-                case TR_PRI_HIGH:
-                    ch = 'h'; break;              /* high */
-
-                default:
-                    ch = 'n'; break;              /* normal */
-            }
-            *walk++ = ch;
-        }
-
-        /* dnd flags */
-        for( i = 0; i < n; ++i )
-            *walk++ = tor->info.files[i].dnd ? 't' : 'f';
-
-        /* write it */
-        assert( walk - buf == 2 * n );
-        fastResumeWriteData( FR_ID_PRIORITY, buf, 1, walk - buf, file );
-
-        /* cleanup */
-        tr_free( buf );
-    }
-
-
-    /* Write the torrent ul/dl speed caps */
-    if( TRUE )
-    {
-        const int len = FR_SPEED_LEN;
-        char *    buf = tr_new0( char, len );
-        char *    walk = buf;
-        uint16_t  i16;
-        uint8_t   i8;
-
-        i16 = (uint16_t) tr_torrentGetSpeedLimit( tor, TR_DOWN );
-        memcpy( walk, &i16, 2 ); walk += 2;
-        i8 = (uint8_t) tr_torrentGetSpeedMode( tor, TR_DOWN );
-        memcpy( walk, &i8, 1 ); walk += 1;
-        i16 = (uint16_t) tr_torrentGetSpeedLimit( tor, TR_UP );
-        memcpy( walk, &i16, 2 ); walk += 2;
-        i8 = (uint8_t) tr_torrentGetSpeedMode( tor, TR_UP );
-        memcpy( walk, &i8, 1 ); walk += 1;
-
-        assert( walk - buf == len );
-        fastResumeWriteData( FR_ID_SPEED, buf, 1, walk - buf, file );
-        tr_free( buf );
-    }
-
-    if( TRUE ) /* FR_ID_RUN */
-    {
-        const char is_running = tor->isRunning ? 't' : 'f';
-        fastResumeWriteData( FR_ID_RUN, &is_running, 1, 1, file );
-    }
-
-    /* Write download and upload totals */
-
-    total = tor->downloadedCur + tor->downloadedPrev;
-    fastResumeWriteData( FR_ID_DOWNLOADED, &total, 8, 1, file );
-
-    total = tor->uploadedCur + tor->uploadedPrev;
-    fastResumeWriteData( FR_ID_UPLOADED, &total, 8, 1, file );
-
-    total = tor->corruptCur + tor->corruptPrev;
-    fastResumeWriteData( FR_ID_CORRUPT, &total, 8, 1, file );
-
-    fastResumeWriteData( FR_ID_MAX_PEERS,
-                         &tor->maxConnectedPeers,
-                         sizeof( uint16_t ), 1, file );
-
-    if( !tor->info.isPrivate )
-    {
-        tr_pex *  pex;
-        const int count = tr_peerMgrGetPeers( tor->handle->peerMgr,
-                                              tor->info.hash,
-                                              &pex );
-        if( count > 0 )
-            fastResumeWriteData( FR_ID_PEERS, pex, sizeof( tr_pex ), count,
-                                 file );
-        tr_free( pex );
-    }
-
-    fclose( file );
-}
-
-#endif
 
 /***
@@ -712 +511 @@
 {
     uint8_t *    ret = NULL;
-    char         path[MAX_PATH_LENGTH];
     const char * cacheDir = tr_getResumeDir( tor->session );
     const char * hash = tor->info.hashString;
@@ -718 +516 @@
     if( !ret && tor->session->tag )
     {
-        char base[1024];
-        tr_snprintf( base, sizeof( base ), "%s-%s", hash, tor->session->tag );
-        tr_buildPath( path, sizeof( path ), cacheDir, base, NULL );
+        char * path = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s-%s", cacheDir, hash, tor->session->tag );
         ret = tr_loadFile( path, len );
-    }
-
+        tr_free( path );
+    }
     if( !ret )
     {
-        tr_buildPath( path, sizeof( path ), cacheDir, hash, NULL );
+        char * path = tr_buildPath( cacheDir, hash, NULL );
         ret = tr_loadFile( path, len );
+        tr_free( path );
     }
 
@@ -775 +572 @@
 tr_fastResumeRemove( const tr_torrent * tor )
 {
-    char         path[MAX_PATH_LENGTH];
     const char * cacheDir = tr_getResumeDir( tor->session );
     const char * hash = tor->info.hashString;
@@ -781 +577 @@
     if( tor->session->tag )
     {
-        char base[1024];
-        tr_snprintf( base, sizeof( base ), "%s-%s", hash, tor->session->tag );
-        tr_buildPath( path, sizeof( path ), cacheDir, base, NULL );
+        char * path = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s-%s", cacheDir, hash, tor->session->tag );
         unlink( path );
+        tr_free( path );
     }
     else
     {
-        tr_buildPath( path, sizeof( path ), cacheDir, hash, NULL );
+        char * path = tr_buildPath( cacheDir, hash, NULL );
         unlink( path );
-    }
-}
-
+        tr_free( path );
+    }
+}
+

trunk/libtransmission/fdlimit.c

@@ -114 +114 @@
     struct tr_openfile * file = &gFd->open[i];
     int                  flags;
-    char                 filename[MAX_PATH_LENGTH];
+    char               * filename;
     struct stat          sb;
 
@@ -122 +122 @@
 
     /* create subfolders, if any */
-    tr_buildPath ( filename, sizeof( filename ), folder, torrentFile, NULL );
+    filename = tr_buildPath( folder, torrentFile, NULL );
     if( write )
     {
@@ -128 +128 @@
         const int err = tr_mkdirp( dirname( tmp ), 0777 ) ? errno : 0;
         tr_free( tmp );
+        tr_free( filename );
         if( err )
             return err;
@@ -146 +147 @@
         tr_err( _( "Couldn't open \"%1$s\": %2$s" ), filename,
                tr_strerror( err ) );
+        tr_free( filename );
         return err;
     }
 
+    tr_free( filename );
     return 0;
 }
@@ -186 +189 @@
     int                  i, winner = -1;
     struct tr_openfile * o;
-    char                 filename[MAX_PATH_LENGTH];
+    char               * filename;
 
     assert( folder && *folder );
@@ -192 +195 @@
     assert( write == 0 || write == 1 );
 
-    tr_buildPath ( filename, sizeof( filename ), folder, torrentFile, NULL );
+    filename = tr_buildPath( folder, torrentFile, NULL );
     dbgmsg( "looking for file '%s', writable %c", filename,
             write ? 'y' : 'n' );
@@ -284 +287 @@
         if( err ) {
             tr_lockUnlock( gFd->lock );
+            tr_free( filename );
             errno = err;
             return -1;
@@ -298 +302 @@
     o->closeWhenDone = 0;
     o->date = tr_date( );
+    tr_free( filename );
     tr_lockUnlock( gFd->lock );
     return o->fd;

trunk/libtransmission/inout.c

@@ -58 +58 @@
     iofunc          func = ioMode ==
                            TR_IO_READ ? (iofunc)read : (iofunc)write;
-    char            path[MAX_PATH_LENGTH];
+    char          * path;
     struct stat     sb;
     int             fd = -1;
@@ -68 +68 @@
     assert( fileOffset + buflen <= file->length );
 
-    tr_buildPath ( path, sizeof( path ), tor->downloadDir, file->name, NULL );
+    path = tr_buildPath( tor->downloadDir, file->name, NULL );
     fileExists = !stat( path, &sb );
+    tr_free( path );
 
     if( !file->length )

trunk/libtransmission/makemeta.c

@@ -48 +48 @@
 {
     int         i;
-    char        buf[MAX_PATH_LENGTH];
+    char        * buf;
     struct stat sb;
     DIR *       odir = NULL;
@@ -54 +54 @@
     sb.st_size = 0;
 
-    tr_buildPath( buf, sizeof( buf ), dir, base, NULL );
+    buf = tr_buildPath( dir, base, NULL );
     i = stat( buf, &sb );
     if( i )
     {
-        tr_err( _(
-                   "Torrent Creator is skipping file \"%s\": %s" ), buf,
-               tr_strerror( errno ) );
+        tr_err( _( "Torrent Creator is skipping file \"%s\": %s" ),
+                buf, tr_strerror( errno ) );
+        tr_free( buf );
         return list;
     }
@@ -84 +84 @@
     }
 
+    tr_free( buf );
     return list;
 }

trunk/libtransmission/platform.c

@@ -296 +296 @@
     if( !path )
     {
+#ifdef __BEOS__
         char buf[MAX_PATH_LENGTH];
-#ifdef __BEOS__
         find_directory( B_USER_SETTINGS_DIRECTORY,
                        dev_for_path( "/boot" ), true,
                        buf, sizeof( buf ) );
-        strcat( buf, "/Transmission" );
+        path = tr_buildPath( buf, "Transmission", NULL );
 #elif defined( SYS_DARWIN )
-        tr_buildPath ( buf, sizeof( buf ), getHomeDir( ),
-                       "Library", "Application Support",
-                       "Transmission", NULL );
+        path = tr_buildPath( getHomeDir( ), "Library",
+                              "Application Support",
+                              "Transmission", NULL );
 #elif defined( __AMIGAOS4__ )
-        tr_strlcpy( buf, "PROGDIR:.transmission", sizeof( buf ) );
+        path = tr_strdup( "PROGDIR:.transmission" );
 #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 ),
-                       getHomeDir( ), ".transmission", NULL );
-#endif
-        path = tr_strdup( buf );
+        path = tr_buildPath( appdata, "Transmission", NULL );
+#else
+        path = tr_buildPath( getHomeDir( ), ".transmission", NULL );
+#endif
     }
 
     return path;
 }
+
+#if defined(SYS_DARWIN) || defined(WIN32)
+ #define RESUME_SUBDIR  "Resume"
+ #define TORRENT_SUBDIR "Torrents"
+#else
+ #define RESUME_SUBDIR  "resume"
+ #define TORRENT_SUBDIR "torrents"
+#endif
 
 static const char *
@@ -329 +334 @@
 
     if( !path )
-    {
-        char         buf[MAX_PATH_LENGTH];
-        const char * p = getOldConfigDir( );
-#if defined( __BEOS__ ) || defined( WIN32 ) || defined( SYS_DARWIN )
-        tr_buildPath( buf, sizeof( buf ), p, "Torrents", NULL );
-#else
-        tr_buildPath( buf, sizeof( buf ), p, "torrents", NULL );
-#endif
-
-        path = tr_strdup( buf );
-    }
+        path = tr_buildPath( getOldConfigDir( ), TORRENT_SUBDIR, NULL );
 
     return path;
@@ -351 +346 @@
     if( !path )
     {
-        char         buf[MAX_PATH_LENGTH];
 #if defined( __BEOS__ ) || defined( WIN32 )
-        const char * p = getOldConfigDir( );
-        tr_buildPath( buf, sizeof( buf ), p, "Cache", NULL );
+        path = tr_buildPath( getOldConfigDir( ), "Cache", NULL );
 #elif defined( SYS_DARWIN )
-        tr_buildPath( buf, sizeof( buf ), getHomeDir( ),
-                      "Library", "Caches", "Transmission", NULL );
-#else
-        const char * p = getOldConfigDir( );
-        tr_buildPath( buf, sizeof( buf ), p, "cache", NULL );
-#endif
-        path = tr_strdup( buf );
+        path = tr_buildPath( getHomeDir( ), "Library", "Caches", "Transmission", NULL );
+#else
+        path = tr_buildPath( getOldConfigDir( ), "cache", NULL );
+#endif
     }
 
@@ -384 +374 @@
                             "." ) && strcmp( dirp->d_name, ".." ) )
                 {
-                    char o[MAX_PATH_LENGTH];
-                    char n[MAX_PATH_LENGTH];
-                    tr_buildPath( o, sizeof( o ), oldDir, dirp->d_name,
-                                  NULL );
-                    tr_buildPath( n, sizeof( n ), newDir, dirp->d_name,
-                                  NULL );
+                    char * o = tr_buildPath( oldDir, dirp->d_name, NULL );
+                    char * n = tr_buildPath( newDir, dirp->d_name, NULL );
                     rename( o, n );
                     ++count;
+                    tr_free( n );
+                    tr_free( o );
                 }
             }
@@ -424 +412 @@
 }
 
-#if defined(SYS_DARWIN) || defined(WIN32)
- #define RESUME_SUBDIR  "Resume"
- #define TORRENT_SUBDIR "Torrents"
-#else
- #define RESUME_SUBDIR  "resume"
- #define TORRENT_SUBDIR "torrents"
-#endif
-
 void
 tr_setConfigDir( tr_handle *  handle,
                  const char * configDir )
 {
-    char buf[MAX_PATH_LENGTH];
+    char * path;
 
     handle->configDir = tr_strdup( configDir );
 
-    tr_buildPath( buf, sizeof( buf ), configDir, RESUME_SUBDIR, NULL );
-    tr_mkdirp( buf, 0777 );
-    handle->resumeDir = tr_strdup( buf );
-
-    tr_buildPath( buf, sizeof( buf ), configDir, TORRENT_SUBDIR, NULL );
-    tr_mkdirp( buf, 0777 );
-    handle->torrentDir = tr_strdup( buf );
+    path = tr_buildPath( configDir, RESUME_SUBDIR, NULL );
+    tr_mkdirp( path, 0777 );
+    handle->resumeDir = path;
+
+    path = tr_buildPath( configDir, TORRENT_SUBDIR, NULL );
+    tr_mkdirp( path, 0777 );
+    handle->torrentDir = path;
 
     migrateFiles( handle );
@@ -476 +456 @@
     if( !s )
     {
-        char path[MAX_PATH_LENGTH];
-
         if( ( s = getenv( "TRANSMISSION_HOME" ) ) )
         {
-            tr_strlcpy( path, s, sizeof( path ) );
+            s = tr_strdup( s );
         }
         else
         {
 #ifdef SYS_DARWIN
-            tr_buildPath( path, sizeof( path ),
-                          getHomeDir( ), "Library", "Application Support",
-                          "Transmission", NULL );
+            s = tr_buildPath( getHomeDir( ), "Library",
+                              "Application Support", "Transmission", NULL );
 #elif defined( WIN32 )
             char appdata[MAX_PATH_LENGTH];
             SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
-            tr_buildPath( path, sizeof( path ),
-                          appdata, "Transmission", NULL );
+            s = tr_buildPath( appdata, "Transmission", NULL );
 #else
             if( ( s = getenv( "XDG_CONFIG_HOME" ) ) )
-                tr_buildPath( path, sizeof( path ),
-                              s, "transmission", NULL );
+                s = tr_buildPath( s, "transmission", NULL );
             else
-                tr_buildPath( path, sizeof( path ),
-                              getHomeDir( ), ".config", "transmission",
-                              NULL );
+                s = tr_buildPath( getHomeDir( ), ".config", "transmission", NULL );
 #endif
         }
-
-        s = tr_strdup( path );
     }
 
@@ -518 +489 @@
 {
     struct stat sb;
-    char        tmp[MAX_PATH_LENGTH];
-
-    tr_buildPath( tmp, sizeof( tmp ), path, "javascript", "transmission.js",
-                  NULL );
+    char * tmp = tr_buildPath( path, "javascript", "transmission.js", NULL );
+    const int ret = !stat( tmp, &sb );
     tr_inf( _( "Searching for web interface file \"%s\"" ), tmp );
-    return !stat( tmp, &sb );
+    tr_free( tmp );
+    return ret;
+    
 }
 
@@ -533 +504 @@
     if( !s )
     {
-        char path[MAX_PATH_LENGTH] = { '\0' };
-
         if( ( s = getenv( "CLUTCH_HOME" ) ) )
         {
-            tr_strlcpy( path, s, sizeof( path ) );
+            s = tr_strdup( s );
         }
         else if( ( s = getenv( "TRANSMISSION_WEB_HOME" ) ) )
         {
-            tr_strlcpy( path, s, sizeof( path ) );
+            s = tr_strdup( s );
         }
         else
@@ -555 +524 @@
             CFRelease( appRef );
 
-            tr_buildPath( path, sizeof( path ), appString, "Contents",
-                          "Resources", "web",
-                          NULL );
-#elif defined( WIN32 )
-
- #warning\
-            hey win32 people is this good or is there a better implementation of the next four lines
-            char     appdata[MAX_PATH_LENGTH];
+            s = tr_buildPath( appString, "Contents", "Resources", "web", NULL );
+#elif defined( WIN32 )
+
+ #warning hey win32 people is this good or is there a better implementation of the next four lines
+            char appdata[MAX_PATH_LENGTH];
             SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, appdata );
-            tr_buildPath( path, sizeof( path ),
-                          appdata, "Transmission", NULL );
+            s = tr_buildPath( appdata, "Transmission", NULL );
 #else
             tr_list *candidates = NULL, *l;
@@ -573 +538 @@
             if( s && *s )
                 tr_list_append( &candidates, tr_strdup( s ) );
-            else
-            {
-                char tmp[MAX_PATH_LENGTH];
-                tr_buildPath( tmp, sizeof( tmp ),
-                              getHomeDir( ), ".local", "share", NULL );
-                tr_list_append( &candidates, tr_strdup( tmp ) );
+            else {
+                char * dhome = tr_buildPath( getHomeDir( ), ".local", "share", NULL );
+                tr_list_append( &candidates, dhome );
             }
 
@@ -602 +564 @@
             for( l = candidates; l; l = l->next )
             {
-                tr_buildPath( path, sizeof( path ), l->data, "transmission",
-                              "web",
-                              NULL );
-                if( isClutchDir( path ) )
+                char * path = tr_buildPath( l->data, "transmission", "web", NULL );
+                const int found = isClutchDir( path );
+                tr_free( path );
+                if( found ) {
+                    s = path;
                     break;
-                *path = '\0';
+                }
             }
 
@@ -613 +576 @@
 #endif
         }
-
-        s = tr_strdup( path );
     }
 

trunk/libtransmission/session.c

@@ -123 +123 @@
     int         newCount = 0;
     struct stat sb;
-    char        dirname[MAX_PATH_LENGTH];
+    char      * dirname;
     DIR *       odir = NULL;
     tr_list *   list = NULL;
@@ -129 +129 @@
 
     /* walk through the directory and find blocklists */
-    tr_buildPath( dirname, sizeof( dirname ), session->configDir,
-                  "blocklists",
-                  NULL );
+    dirname = tr_buildPath( session->configDir, "blocklists", NULL );
     if( !stat( dirname,
                &sb ) && S_ISDIR( sb.st_mode )
@@ -139 +137 @@
         for( d = readdir( odir ); d; d = readdir( odir ) )
         {
-            char filename[MAX_PATH_LENGTH];
+            char * filename;
 
             if( !d->d_name || d->d_name[0] == '.' ) /* skip dotfiles, ., and ..
@@ -145 +143 @@
                 continue;
 
-            tr_buildPath( filename, sizeof( filename ), dirname, d->d_name,
-                          NULL );
+            filename = tr_buildPath( dirname, d->d_name, NULL );
 
             if( tr_stringEndsWith( filename, ".bin" ) )
@@ -177 +174 @@
                 ++newCount;
             }
+
+            tr_free( filename );
         }
 
@@ -188 +187 @@
     if( newCount )
         tr_dbg( "Found %d new blocklists in \"%s\"", newCount, dirname );
+
+    tr_free( dirname );
 }
 
@@ -230 +231 @@
 {
     tr_handle * h;
-    char        filename[MAX_PATH_LENGTH];
+    char      * filename;
 
 #ifndef WIN32
@@ -286 +287 @@
 
     /* initialize the blocklist */
-    tr_buildPath( filename, sizeof( filename ), h->configDir, "blocklists",
-                  NULL );
+    filename = tr_buildPath( h->configDir, "blocklists", NULL );
     tr_mkdirp( filename, 0777 );
+    tr_free( filename );
     h->isBlocklistEnabled = isBlocklistEnabled;
     loadBlocklists( h );
@@ -657 +658 @@
             {
                 tr_torrent * tor;
-                char         filename[MAX_PATH_LENGTH];
-                tr_buildPath( filename, sizeof( filename ), dirname,
-                              d->d_name,
-                              NULL );
-
-                tr_ctorSetMetainfoFromFile( ctor, filename );
-                tor = tr_torrentNew( h, ctor, NULL );
-                if( tor )
+                char * path = tr_buildPath( dirname, d->d_name, NULL );
+                tr_ctorSetMetainfoFromFile( ctor, path );
+                if(( tor = tr_torrentNew( h, ctor, NULL )))
                 {
                     tr_list_append( &list, tor );
                     ++n;
                 }
+                tr_free( path );
             }
         }
@@ -795 +792 @@
     if( !b )
     {
-        char filename[MAX_PATH_LENGTH];
-        tr_buildPath( filename, sizeof( filename ), session->configDir,
-                      "blocklists", defaultName,
-                      NULL );
-        b = _tr_blocklistNew( filename, session->isBlocklistEnabled );
+        char * path = tr_buildPath( session->configDir, "blocklists", defaultName, NULL );
+        b = _tr_blocklistNew( path, session->isBlocklistEnabled );
         tr_list_append( &session->blocklists, b );
+        tr_free( path );
     }
 
@@ -890 +885 @@
             {
                 tr_info inf;
-                char    filename[MAX_PATH_LENGTH];
-                tr_buildPath( filename, sizeof( filename ), dirname,
-                              d->d_name,
-                              NULL );
-                tr_ctorSetMetainfoFromFile( ctor, filename );
+                char * path = tr_buildPath( dirname, d->d_name, NULL );
+                tr_ctorSetMetainfoFromFile( ctor, path );
                 if( !tr_torrentParse( h, ctor, &inf ) )
                 {
                     tr_list_append( &list, tr_strdup( inf.hashString ) );
-                    tr_list_append( &list, tr_strdup( filename ) );
+                    tr_list_append( &list, tr_strdup( path ) );
                     tr_metainfoFree( &inf );
                 }
+                tr_free( path );
             }
         }

trunk/libtransmission/stats.c

@@ -31 +31 @@
 
 static char*
-getOldFilename( const tr_handle * handle,
-                char *            buf,
-                size_t            buflen )
-{
-    tr_buildPath( buf, buflen, tr_sessionGetConfigDir( handle ),
-                  "stats.benc",
-                  NULL );
-    return buf;
+getOldFilename( const tr_handle * handle )
+{
+    return tr_buildPath( tr_sessionGetConfigDir( handle ), "stats.benc", NULL );
 }
 
 static char*
-getFilename( const tr_handle * handle,
-             char *            buf,
-             size_t            buflen )
-{
-    tr_buildPath( buf, buflen, tr_sessionGetConfigDir( handle ),
-                  "stats.json",
-                  NULL );
-    return buf;
+getFilename( const tr_handle * handle )
+{
+    return tr_buildPath( tr_sessionGetConfigDir( handle ), "stats.json", NULL );
 }
 
@@ -57 +47 @@
 {
     int     loaded = FALSE;
-    char    filename[MAX_PATH_LENGTH];
+    char   * filename;
     tr_benc top;
 
-    getFilename( handle, filename, sizeof( filename ) );
+    filename = getFilename( handle );
     loaded = !tr_bencLoadJSONFile( filename, &top );
+    tr_free( filename );
+
     if( !loaded )
     {
-        getOldFilename( handle, filename, sizeof( filename ) );
+        filename = getOldFilename( handle );
         loaded = !tr_bencLoadFile( filename, &top );
+        tr_free( filename );
     }
+
     if( loaded )
     {
@@ -90 +84 @@
                      const tr_session_stats * s )
 {
-    char    filename[MAX_PATH_LENGTH];
+    char * filename;
     tr_benc top;
 
@@ -100 +94 @@
     tr_bencDictAddInt( &top, "uploaded-bytes",   s->uploadedBytes );
 
-    getFilename( handle, filename, sizeof( filename ) );
-    tr_deepLog( __FILE__, __LINE__, NULL, "Saving stats to \"%s\"",
-                filename );
+    filename = getFilename( handle );
+    tr_deepLog( __FILE__, __LINE__, NULL, "Saving stats to \"%s\"", filename );
     tr_bencSaveJSONFile( filename, &top );
 
+    tr_free( filename );
     tr_bencFree( &top );
 }

trunk/libtransmission/torrent.c

@@ -1160 +1160 @@
     for( i = 0; i < tor->info.fileCount; ++i )
     {
-        char            path[MAX_PATH_LENGTH];
         const tr_file * file = &tor->info.files[i];
-        tr_buildPath( path, sizeof( path ), tor->downloadDir, file->name,
-                      NULL );
+        char * path = tr_buildPath( tor->downloadDir, file->name, NULL );
         tr_fdFileClose( path );
+        tr_free( path );
     }
 }
@@ -1646 +1645 @@
     for( i = 0; i < n; ++i )
     {
-        char        fname[MAX_PATH_LENGTH];
         struct stat sb;
-        tr_buildPath( fname, sizeof( fname ),
-                      tor->downloadDir, tor->info.files[i].name, NULL );
-        if( !stat( fname, &sb ) )
+        char * path = tr_buildPath( tor->downloadDir, tor->info.files[i].name, NULL );
+        if( !stat( path, &sb ) )
         {
 #ifdef SYS_DARWIN
@@ -1658 +1655 @@
 #endif
         }
+        tr_free( path );
     }
 

trunk/libtransmission/utils.c

@@ -546 +546 @@
 }
 
-void
-tr_buildPath( char *      buf,
-              size_t      buflen,
-              const char *first_element,
-              ... )
-{
+char*
+tr_buildPath( const char *first_element, ... )
+{
+    char            * ret;
     struct evbuffer * evbuf;
-    const char *      element = first_element;
+    const char      * element = first_element;
     va_list           vl;
 
@@ -567 +565 @@
     }
 
-    if( EVBUFFER_LENGTH( evbuf ) )
-        tr_strlcpy( buf, EVBUFFER_DATA( evbuf ), buflen );
-    else
-        *buf = '\0';
-
     va_end( vl );
+    ret = tr_strndup( EVBUFFER_DATA( evbuf ), EVBUFFER_LENGTH( evbuf ) );
     evbuffer_free( evbuf );
+    return ret;
 }
 

trunk/libtransmission/utils.h

@@ -177 +177 @@
 /* creates a filename from a series of elements using the
    correct separator for filenames. */
-void           tr_buildPath( char*        buf,
-                             size_t       buflen,
-                             const char * first_element,
-                             ... )
-TR_GNUC_NULL_TERMINATED;
+char*          tr_buildPath( const char * first_element, ... )
+                                              TR_GNUC_NULL_TERMINATED
+                                              TR_GNUC_MALLOC;
 
 struct timeval tr_timevalMsec( uint64_t milliseconds );

trunk/libtransmission/verify.c

@@ -68 +68 @@
     int              nofile;
     struct stat      sb;
-    char             path[MAX_PATH_LENGTH];
-    const tr_file *  file = &tor->info.files[fileIndex];
-
-    tr_buildPath ( path, sizeof( path ), tor->downloadDir, file->name, NULL );
+    char           * path;
+    const tr_file  * file = &tor->info.files[fileIndex];
+
+    path = tr_buildPath( tor->downloadDir, file->name, NULL );
     nofile = stat( path, &sb ) || !S_ISREG( sb.st_mode );
 
@@ -111 +111 @@
     }
 
+    tr_free( path );
+
     return changed;
 }