Changeset 4734 for trunk/libtransmission/fdlimit.c

Timestamp:

Jan 18, 2008, 7:13:32 PM (15 years ago)

Author:

charles

Message:

if the torrent's download path doesn't exist, don't create it -- it's might be a removeable disk that got unplugged.

File:

• trunk/libtransmission/fdlimit.c (modified) (4 diffs)

trunk/libtransmission/fdlimit.c

@@ -128 +128 @@
 ***/
 
-static int
-TrOpenFile( int i, const char * filename, int write )
+static tr_errno
+TrOpenFile( int           i,
+            const char  * folder,
+            const char  * torrentFile,
+            int           write )
 {
     struct tr_openfile * file = &gFd->open[i];
     int flags;
+    char filename[MAX_PATH_LENGTH];
+    struct stat sb;
+
+    /* confirm the parent folder exists */
+    if( stat( folder, &sb ) || !S_ISDIR( sb.st_mode ) )
+        return TR_ERROR_IO_PARENT;
 
     /* create subfolders, if any */
+    tr_buildPath ( filename, sizeof(filename), folder, torrentFile, NULL );
     if( write ) {
         char * tmp = tr_strdup( filename );
-        const int val = tr_mkdirp( dirname(tmp), 0777 );
+        const int err = tr_mkdirp( dirname(tmp), 0777 ) ? errno : 0;
         tr_free( tmp );
-        if( val )
-            return tr_ioErrorFromErrno( );
+        if( err )
+            return tr_ioErrorFromErrno( err );
     }
 
@@ -151 +161 @@
     flags |= O_BINARY;
 #endif
-    errno = 0;
     file->fd = open( filename, flags, 0666 );
-    if( file->fd < 0 ) {
-        if( errno ) {
-            tr_err( "Couldn't open '%s': %s", filename, strerror(errno) );
-            return tr_ioErrorFromErrno();
-        } else {
-            tr_err( "Couldn't open '%s'", filename );
-            return TR_ERROR_IO_OTHER;
-        }
-    }
-
-    return TR_OK;
+    if( file->fd == -1 ) {
+        const int err = errno;
+        tr_err( "Couldn't open '%s': %s", filename, strerror(err) );
+        return tr_ioErrorFromErrno( err );
+    }
+
+    return 0;
 }
 
@@ -193 +198 @@
 
 int
-tr_fdFileCheckout( const char * filename, int write )
+tr_fdFileCheckout( const char * folder,
+                   const char * torrentFile, 
+                   int          write )
 {
     int i, winner = -1;
     struct tr_openfile * o;
-
-    assert( filename && *filename );
+    char filename[MAX_PATH_LENGTH];
+
+    assert( folder && *folder );
+    assert( torrentFile && *torrentFile );
     assert( write==0 || write==1 );
 
+    tr_buildPath ( filename, sizeof(filename), folder, torrentFile, NULL );
     dbgmsg( "looking for file '%s', writable %c", filename, write?'y':'n' );
 
@@ -275 +285 @@
     if( !fileIsOpen( o ) )
     {
-        const int ret = TrOpenFile( winner, filename, write );
-        if( ret ) {
+        const tr_errno err = TrOpenFile( winner, folder, torrentFile, write );
+        if( err ) {
             tr_lockUnlock( gFd->lock );
-            return ret;
+            return err;
         }