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 27 matching lines @@
     current_buffer += bytes_read;  // Move the buffer forward.
   }
   return true;
 }
 
 
 bool File::WriteFully(const void* buffer, int64_t num_bytes) {
   int64_t remaining = num_bytes;
   const char* current_buffer = reinterpret_cast<const char*>(buffer);
   while (remaining > 0) {
-    int64_t bytes_read = Write(current_buffer, remaining);
-    if (bytes_read < 0) {
+    int64_t bytes_written = Write(current_buffer, remaining);
+    if (bytes_written < 0) {
       return false;
     }
-    remaining -= bytes_read;  // Reduce the number of remaining bytes.
-    current_buffer += bytes_read;  // Move the buffer forward.
+    remaining -= bytes_written;  // Reduce the number of remaining bytes.
+    current_buffer += bytes_written;  // Move the buffer forward.
   }
   return true;
 }
 
 
 File::FileOpenMode File::DartModeToFileMode(DartFileOpenMode mode) {
   ASSERT(mode == File::kDartRead ||
          mode == File::kDartWrite ||
          mode == File::kDartAppend);
   if (mode == File::kDartWrite) {
@@ skipping 69 matching lines @@
   }
 }
 
 
 void FUNCTION_NAME(File_WriteByte)(Dart_NativeArguments args) {
   File* file = GetFilePointer(Dart_GetNativeArgument(args, 0));
   ASSERT(file != NULL);
   int64_t byte = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 1), &byte)) {
     uint8_t buffer = static_cast<uint8_t>(byte & 0xff);
-    int64_t bytes_written = file->Write(reinterpret_cast<void*>(&buffer), 1);
-    if (bytes_written >= 0) {
-      Dart_SetReturnValue(args, Dart_NewInteger(bytes_written));
+    bool success = file->WriteFully(reinterpret_cast<void*>(&buffer), 1);
+    if (success) {
+      Dart_SetReturnValue(args, Dart_NewInteger(1));
     } else {
       Dart_Handle err = DartUtils::NewDartOSError();
       if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, err);
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
@@ skipping 103 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.
+  bool success = file->WriteFully(buffer, length);
+
   // Release the direct pointer acquired above.
   result = Dart_TypedDataReleaseData(buffer_obj);
   if (Dart_IsError(result)) Dart_PropagateError(result);
 
-  if (bytes_written != length) {
+  if (!success) {
     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 659 matching lines @@
 
 CObject* File::WriteByteRequest(const CObjectArray& request) {
   if (request.Length() == 2 &&
       request[0]->IsIntptr() &&
       request[1]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[0]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t byte = CObjectInt32OrInt64ToInt64(request[1]);
       uint8_t buffer = static_cast<uint8_t>(byte & 0xff);
-      int64_t bytes_written = file->Write(reinterpret_cast<void*>(&buffer), 1);
-      if (bytes_written > 0) {
-        return new CObjectInt64(CObject::NewInt64(bytes_written));
+      bool success = file->WriteFully(reinterpret_cast<void*>(&buffer), 1);
+      if (success) {
+        return new CObjectInt64(CObject::NewInt64(1));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
@@ skipping 114 matching lines @@
             int64_t value = CObjectInt32OrInt64ToInt64(array[i + start]);
             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);
+      bool success =
+          file->WriteFully(reinterpret_cast<void*>(buffer_start), length);
       if (!request[1]->IsTypedData()) {
         delete[] buffer_start;
       }
-      if (bytes_written >= 0) {
-        return new CObjectInt64(CObject::NewInt64(bytes_written));
+      if (success) {
+        return new CObjectInt64(CObject::NewInt64(length));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
@@ skipping 133 matching lines @@
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 }  // namespace bin
 }  // namespace dart