Changeset 1201

Timestamp:

Dec 13, 2006, 9:41:41 PM (16 years ago)

Author:

titer

Message:

Updates inout to work with previous changes

Location:

branches/io/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• inout.c (modified) (6 diffs)

branches/io/libtransmission/fdlimit.c

@@ -203 +203 @@
     tr_dbg( "Opening %s in %s", name, folder );
     asprintf( &path, "%s/%s", folder, name );
-    f->open[winner].file = open( path, write ? O_RDWR : O_RDONLY, 0 );
+    f->open[winner].file = open( path, write ? O_RDWR|O_CREAT : O_RDONLY, 0 );
     free( path );
     if( f->open[winner].file < 0 )

branches/io/libtransmission/inout.c

@@ -47 +47 @@
  * Local prototypes
  **********************************************************************/
-static int  createFiles( tr_io_t * );
 static int  checkFiles( tr_io_t * );
 static void closeFiles( tr_io_t * );
@@ -96 +95 @@
     io->tor = tor;
 
-    if( createFiles( io ) || checkFiles( io ) )
+    if( checkFiles( io ) )
     {
         free( io );
@@ -218 +217 @@
 
 /***********************************************************************
- * createFiles
- ***********************************************************************
- * Make sure the existing folders/files have correct types and
- * permissions, and create missing folders and files
- **********************************************************************/
-static int createFiles( tr_io_t * io )
-{
-    tr_torrent_t * tor = io->tor;
-    tr_info_t    * inf = &tor->info;
-
-    int           i;
-    char        * path, * p;
-    struct stat   sb;
-    int           file;
-
-    tr_dbg( "Creating files..." );
-
-    for( i = 0; i < inf->fileCount; i++ )
-    {
-        asprintf( &path, "%s/%s", tor->destination, inf->files[i].name );
-
-        /* Create folders */
-        if( NULL != ( p = strrchr( path, '/' ) ) )
-        {
-            *p = '\0';
-            if( tr_mkdir( path ) )
-            {
-                free( path );
-                return 1;
-            }
-            *p = '/';
-        }
-
-        /* Empty folders use a dummy "" file, skip those */
-        if( p == &path[strlen( path ) - 1] )
-        {
-            free( path );
-            continue;
-        }
-
-        if( stat( path, &sb ) )
-        {
-            /* File doesn't exist yet */
-            if( ( file = open( path, O_WRONLY|O_CREAT|O_TRUNC, 0666 ) ) < 0 )
-            {
-                tr_err( "Could not create `%s' (%s)", path,
-                        strerror( errno ) );
-                free( path );
-                return 1;
-            }
-            close( file );
-        }
-        else if( ( sb.st_mode & S_IFMT ) != S_IFREG )
-        {
-            /* Node exists but isn't a file */
-            /* XXX this should be reported to the frontend somehow */
-            tr_err( "Remove %s, it's in the way.", path );
-            free( path );
-            return 1;
-        }
-
-        free( path );
-    }
-
-    return 0;
-}
-
-/***********************************************************************
  * checkFiles
  ***********************************************************************
@@ -374 +305 @@
     for( i = 0; i < inf->fileCount; i++ )
     {
-        asprintf( &path, "%s/%s", tor->destination, inf->files[i].name );
-        tr_fdFileClose( tor->fdlimit, path );
-        free( path );
+        tr_fdFileClose( tor->fdlimit, tor->destination,
+                        inf->files[i].name );
     }
 }
@@ -443 +373 @@
         if( cur > 0 )
         {
-            /* Now let's get a stream on the file... */
-            asprintf( &path, "%s/%s", tor->destination, inf->files[i].name );
-            file = tr_fdFileOpen( tor->fdlimit, path );
+            /* Now let's get a descriptor on the file... */
+            file = tr_fdFileOpen( tor->fdlimit, tor->destination,
+                                  inf->files[i].name, isWrite );
             if( file < 0 )
             {
-                tr_err( "readOrWriteBytes: could not open file '%s'", path );
-                free( path );
+                tr_err( "readOrWriteBytes: could not open file '%s'",
+                        inf->files[i].name);
                 goto fail;
             }
-            free( path );
 
             /* seek to the right offset... */
@@ -466 +395 @@
             }
 
-            /* and close the stream. */
+            /* and release the descriptor. */
             tr_fdFileRelease( tor->fdlimit, file );
         }