Changeset 6896 for trunk/libtransmission/platform.c

Timestamp:

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

Author:

charles

Message:

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

File:

• trunk/libtransmission/platform.c (modified) (12 diffs)

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 );
     }