Error reporting on File in dart:io

runtime/bin/directory.cc

 // Copyright (c) 2012, 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/directory.h"
 
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "include/dart_api.h"
 #include "platform/assert.h"
@@ skipping 47 matching lines @@
   } else {
     Dart_SetReturnValue(args, Dart_NewBoolean(false));
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Directory_CreateTemp)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
-  Dart_Handle status_handle = Dart_GetNativeArgument(args, 1);
-  static const int kMaxChildOsErrorMessageLength = 256;
-  char os_error_message[kMaxChildOsErrorMessageLength];
-  if (!Dart_IsString(path)) {
-    DartUtils::SetIntegerField(status_handle, "_errorCode", 0);
-    DartUtils::SetStringField(
-        status_handle, "_errorMessage", "Invalid arguments");
-    Dart_SetReturnValue(args, Dart_Null());
-    Dart_ExitScope();
-    return;
-  }
-
-  char* result = NULL;
-  int error_code = Directory::CreateTemp(DartUtils::GetStringValue(path),
-                                         &result,
-                                         os_error_message,
-                                         kMaxChildOsErrorMessageLength);
-  if (error_code == 0) {
+  char* result = Directory::CreateTemp(DartUtils::GetStringValue(path));
+  if (result != NULL) {
     Dart_SetReturnValue(args, Dart_NewString(result));
     free(result);
   } else {
-    ASSERT(result == NULL);
-    if (error_code == -1) {
-      DartUtils::SetIntegerField(status_handle, "_errorCode", 0);
-      DartUtils::SetStringField(
-          status_handle, "_errorMessage", "Invalid arguments");
-    } else {
-      DartUtils::SetIntegerField(
-          status_handle, "_errorCode", error_code);
-      DartUtils::SetStringField(
-          status_handle, "_errorMessage", os_error_message);
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
     }
-    Dart_SetReturnValue(args, Dart_Null());
+    Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Directory_Delete)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
   Dart_Handle recursive = Dart_GetNativeArgument(args, 1);
   if (Dart_IsString(path) && Dart_IsBoolean(recursive)) {
@@ skipping 44 matching lines @@
     }
     return new CObjectInt32(CObject::NewInt32(return_value));
   }
   return new CObjectInt32(CObject::NewInt32(kDoesNotExist));
 }
 
 
 static CObject* DirectoryCreateTempRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString path(request[1]);
-
-    static const int kMaxChildOsErrorMessageLength = 256;
-    char os_error_message[kMaxChildOsErrorMessageLength];
-    char* result = NULL;
-    int error_code = Directory::CreateTemp(path.CString(),
-                                           &result,
-                                           os_error_message,
-                                           kMaxChildOsErrorMessageLength);
-    if (error_code == 0) {
+    char* result = Directory::CreateTemp(path.CString());
+    if (result != NULL) {
       CObject* temp_dir = new CObjectString(CObject::NewString(result));
       free(result);
       return temp_dir;
     } else {
-      ASSERT(result == NULL);
-      CObjectArray* error_response = new CObjectArray(CObject::NewArray(2));
-      if (error_code == -1) {
-        error_response->SetAt(0, new CObjectInt32(CObject::NewInt32(0)));
-        error_response->SetAt(
-            1, new CObjectString(CObject::NewString("Invalid arguments")));
-      } else {
-        error_response->SetAt(
-            0, new CObjectInt32(CObject::NewInt32(error_code)));
-        error_response->SetAt(
-            1, new CObjectString(CObject::NewString(os_error_message)));
-      }
-      return error_response;
+      return CObject::NewOSError();
     }
   }
   return CObject::False();
 }
 
 
 static CObject* DirectoryListRequest(const CObjectArray& request,
                                      Dart_Port response_port) {
   if (request.Length() == 3 && request[1]->IsString() && request[2]->IsBool()) {
     DirectoryListing* dir_listing = new DirectoryListing(response_port);
@@ skipping 107 matching lines @@
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }
 
 
 bool DirectoryListing::HandleError(char* message) {
   // TODO(sgjesse): Pass flags to indicate whether error
   // responses are needed.
   CObjectArray* response = NewResponse(kListError, message);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }