From c2157e608e8225040cf3cc0d288a2c641d33f14c Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 22 Nov 2015 00:36:43 +0900
Subject: [PATCH] Fix bug that file allocation=trunc get stuck with Windows
 symlink

---
 src/MultiFileAllocationIterator.cc | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/MultiFileAllocationIterator.cc b/src/MultiFileAllocationIterator.cc
index 225d8a00..47a124a4 100644
--- a/src/MultiFileAllocationIterator.cc
+++ b/src/MultiFileAllocationIterator.cc
@@ -42,6 +42,7 @@
 #endif // HAVE_SOME_FALLOCATE
 #include "DiskWriter.h"
 #include "DefaultDiskWriterFactory.h"
+#include "LogFactory.h"
 
 namespace aria2 {
 
@@ -59,18 +60,26 @@ MultiFileAllocationIterator::~MultiFileAllocationIterator() {
 
 void MultiFileAllocationIterator::allocateChunk()
 {
-  while((!fileAllocationIterator_ ||
-         fileAllocationIterator_->finished()) &&
-        entryItr_ != std::end(diskAdaptor_->getDiskWriterEntries())) {
+  if (fileAllocationIterator_) {
+    if (!fileAllocationIterator_->finished()) {
+      fileAllocationIterator_->allocateChunk();
+      return;
+    }
+
     if (diskWriter_) {
       diskWriter_->closeFile();
       diskWriter_.reset();
     }
     fileAllocationIterator_.reset();
+    ++entryItr_;
+  }
+
+  while(entryItr_ != std::end(diskAdaptor_->getDiskWriterEntries())) {
     if(!(*entryItr_)->getDiskWriter()) {
       ++entryItr_;
       continue;
     }
+
     auto& fileEntry = (*entryItr_)->getFileEntry();
     // we use dedicated DiskWriter instead of
     // (*entryItr_)->getDiskWriter().  This is because
@@ -84,6 +93,10 @@ void MultiFileAllocationIterator::allocateChunk()
 
     if((*entryItr_)->needsFileAllocation() &&
        (*entryItr_)->size() < fileEntry->getLength()) {
+      A2_LOG_INFO(fmt("Allocating file %s: target size=%" PRId64
+                      ", current size=%" PRId64,
+                      (*entryItr_)->getFilePath().c_str(),
+                      fileEntry->getLength(), (*entryItr_)->size()));
       switch(diskAdaptor_->getFileAllocationMethod()) {
 #ifdef HAVE_SOME_FALLOCATE
       case(DiskAdaptor::FILE_ALLOC_FALLOC):
@@ -106,14 +119,15 @@ void MultiFileAllocationIterator::allocateChunk()
            fileEntry->getLength());
         break;
       }
-      break;
+      fileAllocationIterator_->allocateChunk();
+      return;
     }
+
+    diskWriter_->closeFile();
+    diskWriter_.reset();
+
     ++entryItr_;
   }
-  if(finished()) {
-    return;
-  }
-  fileAllocationIterator_->allocateChunk();
 }
 
 bool MultiFileAllocationIterator::finished()