Make sure File_WriteFrom write all data unless an error occour

runtime/bin/file.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
 #include "bin/utils.h"
@@ skipping 248 matching lines @@
   intptr_t buffer_len = 0;
   void* buffer = NULL;
   Dart_Handle result =
       Dart_TypedDataAcquireData(buffer_obj, &type, &buffer, &buffer_len);
   if (Dart_IsError(result)) Dart_PropagateError(result);
 
   ASSERT(type == Dart_TypedData_kUint8 || type == Dart_TypedData_kInt8);
   ASSERT(end <= buffer_len);
   ASSERT(buffer != NULL);
 
-  // Write the data out into the file.
-  int64_t bytes_written = file->Write(buffer, length);
+  // Write all the data out into the file.
+  int64_t remaining = length;
+  while (remaining > 0) {
+    int64_t written = file->Write(buffer, remaining);

[Anders Johnsen, 2015/03/18 10:11:13]

Use file->WriteFully instead?

[Søren Gjesse, 2015/03/19 10:12:44]

Forgot about that. Done.

+    if (written < 0) {
+      break;
+    }
+    remaining -= written;
+    buffer = reinterpret_cast<uint8_t*>(buffer) + written;
+  }
   // Release the direct pointer acquired above.
   result = Dart_TypedDataReleaseData(buffer_obj);
   if (Dart_IsError(result)) Dart_PropagateError(result);
 
-  if (bytes_written != length) {
+  if (remaining > 0) {
     Dart_Handle err = DartUtils::NewDartOSError();
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
+  } else {
+    Dart_SetReturnValue(args, Dart_Null());
   }
 }
 
 
 void FUNCTION_NAME(File_Position)(Dart_NativeArguments args) {
   File* file = GetFilePointer(Dart_GetNativeArgument(args, 0));
   ASSERT(file != NULL);
   intptr_t return_value = file->Position();
   if (return_value >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(return_value));
@@ skipping 797 matching lines @@
             buffer_start[i] = static_cast<uint8_t>(value & 0xFF);
           } else {
             // Unsupported type.
             delete[] buffer_start;
             return CObject::IllegalArgumentError();
           }
         }
         start = 0;
       }
       int64_t bytes_written =
           file->Write(reinterpret_cast<void*>(buffer_start), length);

[Anders Johnsen, 2015/03/18 10:11:13]

Problem here too?

[Søren Gjesse, 2015/03/19 10:12:44]

Yes. Fixed here as well. Also did it for the write byte methods.

       if (!request[1]->IsTypedData()) {
         delete[] buffer_start;
       }
       if (bytes_written >= 0) {
         return new CObjectInt64(CObject::NewInt64(bytes_written));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
@@ skipping 138 matching lines @@
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 }  // namespace bin
 }  // namespace dart