Changeset 7543
- Timestamp:
- Dec 30, 2008, 3:29:09 AM (12 years ago)
- Location:
- trunk/libtransmission
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/fdlimit.c
r7439 r7543 262 262 uint64_t desiredFileSize ) 263 263 { 264 int 264 int i, winner = -1; 265 265 struct tr_openfile * o; 266 char * filename;266 char filename[MAX_PATH_LENGTH]; 267 267 268 268 assert( folder && *folder ); … … 270 270 assert( doWrite == 0 || doWrite == 1 ); 271 271 272 filename = tr_buildPath( folder, torrentFile, NULL ); 273 dbgmsg( "looking for file '%s', writable %c", filename, 274 doWrite ? 'y' : 'n' ); 272 tr_snprintf( filename, sizeof( filename ), "%s%c%s", folder, TR_PATH_DELIMITER, torrentFile ); 273 dbgmsg( "looking for file '%s', writable %c", filename, doWrite ? 'y' : 'n' ); 275 274 276 275 tr_lockLock( gFd->lock ); … … 362 361 if( err ) { 363 362 tr_lockUnlock( gFd->lock ); 364 tr_free( filename );365 363 errno = err; 366 364 return -1; … … 377 375 o->closeWhenDone = 0; 378 376 o->date = tr_date( ); 379 tr_free( filename );380 377 tr_lockUnlock( gFd->lock ); 381 378 return o->fd; -
trunk/libtransmission/inout.c
r7531 r7543 74 74 75 75 typedef size_t ( *iofunc )( int, void *, size_t ); 76 iofunc func = ioMode == 77 TR_IO_READ ? (iofunc)read : (iofunc)write; 78 char * path; 76 iofunc func = ioMode == TR_IO_READ ? (iofunc)read : (iofunc)write; 79 77 struct stat sb; 80 78 int fd = -1; … … 87 85 assert( fileOffset + buflen <= file->length ); 88 86 89 path = tr_buildPath( tor->downloadDir, file->name, NULL ); 90 fileExists = !stat( path, &sb ); 91 tr_free( path ); 87 { 88 char path[MAX_PATH_LENGTH]; 89 tr_snprintf( path, sizeof( path ), "%s%c%s", tor->downloadDir, TR_PATH_DELIMITER, file->name ); 90 fileExists = !stat( path, &sb ); 91 } 92 92 93 93 if( !file->length ) -
trunk/libtransmission/platform.h
r7535 r7543 37 37 #define MAX_PATH_LENGTH MAX_PATH 38 38 #else 39 #define MAX_PATH_LENGTH 102439 #define MAX_PATH_LENGTH 2048 40 40 #endif 41 41 -
trunk/libtransmission/utils.c
r7539 r7543 679 679 680 680 char* 681 tr_strdup_printf( const char * fmt, 682 ... ) 681 tr_strdup_printf( const char * fmt, ... ) 683 682 { 684 683 char * ret = NULL;
Note: See TracChangeset
for help on using the changeset viewer.