Ticket #1486: inout.c-cleaned-code.patch

inout.c

@@ -85 +85 @@
         err = errno;
     else if( ( fd = tr_fdFileCheckout ( tor->downloadDir, file->name, ioMode == TR_IO_WRITE, !file->dnd, file->length ) ) < 0 )
         err = errno;
+#if defined(WIN32)
+
+// Means we are compiling from MSVS
+# if defined(_MSC_VER)
+    // _lseeki64 declaration is 
+    // __int64 __cdecl _lseeki64(__in int _FileHandle, __in __int64 _Offset, __in int _Origin)
+    // So result should be compared long
+    else if( lseek( fd, fileOffset, SEEK_SET ) == ( -1L ) )
+# else
+    // 
+    // As lseek is redefined above to _lseeki64, casting to off_t (1) cannot be 
+    // performed on MinGW because large file support is not supported and (2) is 
+    // not necessary on MSVC because the function accepts __int64 anyway. 
+    // 
+    else if( lseek( fd, fileOffset, SEEK_SET ) == ( -1 ) ) 
+# endif
+#else
     else if( lseek( fd, (off_t)fileOffset, SEEK_SET ) == ( (off_t)-1 ) )
+#endif
         err = errno;
     else if( func( fd, buf, buflen ) != buflen )
         err = errno;
@@ -136 +154 @@
     assert( tor->info.files[*fileIndex].offset + *fileOffset == offset );
 }
 
-#ifdef WIN32
-/* return 0 on success, or an errno on failure */
-static int
-ensureMinimumFileSize( const tr_torrent * tor,
-                       tr_file_index_t    fileIndex,
-                       uint64_t           minBytes )
-{
-    int             fd;
-    int             err;
-    struct stat     sb;
-    const tr_file * file = &tor->info.files[fileIndex];
-
-    assert( 0 <= fileIndex && fileIndex < tor->info.fileCount );
-    assert( minBytes <= file->length );
-
-    fd = tr_fdFileCheckout( tor->downloadDir,
-                            file->name, TRUE, !file->dnd, file->length );
-
-    if( fd < 0 ) /* bad fd */
-        err = errno;
-    else if( fstat ( fd, &sb ) ) /* how big is the file? */
-        err = errno;
-    else if( sb.st_size >= (off_t)minBytes ) /* already big enough */
-        err = 0;
-    else if( !tr_ftruncate( fd, minBytes ) )  /* grow it */
-        err = 0;
-    else /* couldn't grow it */
-        err = errno;
-
-    if( fd >= 0 )
-        tr_fdFileReturn( fd );
-
-    return err;
-}
-
-#endif
-
 /* returns 0 on success, or an errno on failure */
 static int
 readOrWritePiece( const tr_torrent * tor,
@@ -201 +182 @@
         const uint64_t  bytesThisPass = MIN( buflen,
                                              file->length - fileOffset );
 
-#ifdef WIN32
-        if( ioMode == TR_IO_WRITE )
-            err = ensureMinimumFileSize( tor, fileIndex,
-                                         fileOffset + bytesThisPass );
-        if( !err )
-#endif
         err = readOrWriteBytes( tor, ioMode,
                                 fileIndex, fileOffset, buf, bytesThisPass );
         buf += bytesThisPass;