Error reporting on File in dart:io

runtime/bin/file.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/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
+#include "bin/utils.h"
 
 #include "include/dart_api.h"
 
 dart::Mutex File::mutex_;
 int File::service_ports_size_ = 0;
 Dart_Port* File::service_ports_ = NULL;
 int File::service_ports_index_ = 0;
 
 bool File::ReadFully(void* buffer, int64_t num_bytes) {
   int64_t remaining = num_bytes;
@@ skipping 45 matching lines @@
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   int mode = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   File::DartFileOpenMode dart_file_mode =
       static_cast<File::DartFileOpenMode>(mode);
   File::FileOpenMode file_mode = File::DartModeToFileMode(dart_file_mode);
   // Check that the file exists before opening it only for
   // reading. This is to prevent the opening of directories as
   // files. Directories can be opened for reading using the posix
   // 'open' call.
   File* file = NULL;
-  if (((file_mode & File::kWrite) != 0) || File::Exists(filename)) {
-    file = File::Open(filename, file_mode);
+  file = File::Open(filename, file_mode);
+  if (file != NULL) {
+    Dart_SetReturnValue(args,
+                        Dart_NewInteger(reinterpret_cast<intptr_t>(file)));
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
+    Dart_SetReturnValue(args, err);
   }
-  Dart_SetReturnValue(args, Dart_NewInteger(reinterpret_cast<intptr_t>(file)));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_Exists)(Dart_NativeArguments args) {
   Dart_EnterScope();
   const char* filename =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   bool exists = File::Exists(filename);
   Dart_SetReturnValue(args, Dart_NewBoolean(exists));
@@ skipping 226 matching lines @@
   Dart_SetReturnValue(args, Dart_NewInteger(return_value));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_Create)(Dart_NativeArguments args) {
   Dart_EnterScope();
   const char* str =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   bool result = File::Create(str);
-  Dart_SetReturnValue(args, Dart_NewBoolean(result));
+  if (result) {
+    Dart_SetReturnValue(args, Dart_NewBoolean(result));
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
+    Dart_SetReturnValue(args, err);
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_Delete)(Dart_NativeArguments args) {
   Dart_EnterScope();
   const char* str =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   bool result = File::Delete(str);
-  Dart_SetReturnValue(args, Dart_NewBoolean(result));
+  if (result) {
+    Dart_SetReturnValue(args, Dart_NewBoolean(result));
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
+    Dart_SetReturnValue(args, err);
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_Directory)(Dart_NativeArguments args) {
   Dart_EnterScope();
   const char* str =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   char* str_copy = strdup(str);
   char* path = File::GetContainingDirectory(str_copy);
+  free(str_copy);
   if (path != NULL) {
     Dart_SetReturnValue(args, Dart_NewString(path));
+    free(path);
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
+    Dart_SetReturnValue(args, err);
   }
-  free(str_copy);
-  free(path);
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_FullPath)(Dart_NativeArguments args) {
   Dart_EnterScope();
   const char* str =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
   char* path = File::GetCanonicalPath(str);
   if (path != NULL) {
     Dart_SetReturnValue(args, Dart_NewString(path));
     free(path);
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) {
+      Dart_PropagateError(err);
+    }
+    Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(File_OpenStdio)(Dart_NativeArguments args) {
   Dart_EnterScope();
   int fd = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 0));
   File* file = File::OpenStdio(fd);
   Dart_SetReturnValue(args, Dart_NewInteger(reinterpret_cast<intptr_t>(file)));
@@ skipping 29 matching lines @@
   return reinterpret_cast<File*>(value.Value());
 }
 
 
 static CObject* FileExistsRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString filename(request[1]);
     bool result = File::Exists(filename.CString());
     return CObject::Bool(result);
   }
-  return CObject::False();
+  return CObject::IllegalArgumentError();
 }
 
 
 static CObject* FileCreateRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString filename(request[1]);
     bool result = File::Create(filename.CString());
-    return CObject::Bool(result);
+    if (result) {
+      return CObject::True();
+    } else {
+      return CObject::NewOSError();
+    }
   }
-  return CObject::False();
+  return CObject::IllegalArgumentError();
 }
 
-
 static CObject* FileOpenRequest(const CObjectArray& request) {
   File* file = NULL;
   if (request.Length() == 3 &&
       request[1]->IsString() &&
       request[2]->IsInt32()) {
     CObjectString filename(request[1]);
     CObjectInt32 mode(request[2]);
     File::DartFileOpenMode dart_file_mode =
         static_cast<File::DartFileOpenMode>(mode.Value());
     File::FileOpenMode file_mode = File::DartModeToFileMode(dart_file_mode);
-    if (((file_mode & File::kWrite) != 0) || File::Exists(filename.CString())) {
-      file = File::Open(filename.CString(), file_mode);
+    file = File::Open(filename.CString(), file_mode);
+    if (file != NULL) {
+      return new CObjectIntptr(
+          CObject::NewIntptr(reinterpret_cast<intptr_t>(file)));
+    } else {
+      return CObject::NewOSError();
     }
   }
-  return new CObjectIntptr(
-      CObject::NewIntptr(reinterpret_cast<intptr_t>(file)));
+  return CObject::IllegalArgumentError();
 }
 
 
 static CObject* FileDeleteRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString filename(request[1]);
     bool result = File::Delete(filename.CString());
-    return CObject::Bool(result);
+    if (result) {
+      return CObject::True();
+    } else {
+      return CObject::NewOSError();
+    }
   }
   return CObject::False();
 }
 
 
 static CObject* FileFullPathRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString filename(request[1]);
-    char* path = File::GetCanonicalPath(filename.CString());
-    return new CObjectString(CObject::NewString(path));
+    char* result = File::GetCanonicalPath(filename.CString());
+    if (result != NULL) {
+      CObject* path = new CObjectString(CObject::NewString(result));
+      free(result);
+      return path;
+    } else {
+      return CObject::NewOSError();
+    }
   }
-  return CObject::Null();
+  return CObject::IllegalArgumentError();
 }
 
 
 static CObject* FileDirectoryRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString filename(request[1]);
-    if (File::Exists(filename.CString())) {
-      char* str_copy = strdup(filename.CString());
-      char* path = File::GetContainingDirectory(str_copy);
-      free(str_copy);
-      if (path != NULL) {
-        CObject* result = new CObjectString(CObject::NewString(path));
-        free(path);
-        return result;
-      }
+    char* str_copy = strdup(filename.CString());
+    char* path = File::GetContainingDirectory(str_copy);
+    free(str_copy);
+    if (path != NULL) {
+      CObject* result = new CObjectString(CObject::NewString(path));
+      free(path);
+      return result;
+    } else {
+      return CObject::NewOSError();
     }
   }
   return CObject::Null();
 }
 
 
 static CObject* FileCloseRequest(const CObjectArray& request) {
   intptr_t return_value = -1;
   if (request.Length() == 2 && request[1]->IsIntptr()) {
     File* file = CObjectToFilePointer(request[1]);
@@ skipping 281 matching lines @@
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_Null());
   Dart_Port service_port = File::GetServicePort();
   if (service_port != kIllegalPort) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }