Add support for directory renaming to 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 20 matching lines @@
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
   Directory::ExistsResult result =
       Directory::Exists(DartUtils::GetStringValue(path));
   if (result == Directory::EXISTS) {
     Dart_SetReturnValue(args, Dart_NewInteger(kExists));
   } else if (result == Directory::DOES_NOT_EXIST) {
     Dart_SetReturnValue(args, Dart_NewInteger(kDoesNotExist));
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
-    if (Dart_IsError(err)) {
-      Dart_PropagateError(err);
-    }
+    if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Directory_Create)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
   if (Directory::Create(DartUtils::GetStringValue(path))) {
     Dart_SetReturnValue(args, Dart_True());
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
-    if (Dart_IsError(err)) {
-      Dart_PropagateError(err);
-    }
+    if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Directory_CreateTemp)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle path = Dart_GetNativeArgument(args, 0);
   char* result = Directory::CreateTemp(DartUtils::GetStringValue(path));
   if (result != NULL) {
     Dart_SetReturnValue(args, Dart_NewString(result));
     free(result);
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
-    if (Dart_IsError(err)) {
-      Dart_PropagateError(err);
-    }
+    if (Dart_IsError(err)) Dart_PropagateError(err);
     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 (Directory::Delete(DartUtils::GetStringValue(path),
                         DartUtils::GetBooleanValue(recursive))) {
     Dart_SetReturnValue(args, Dart_True());
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
-    if (Dart_IsError(err)) {
-      Dart_PropagateError(err);
-    }
+    if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
   Dart_ExitScope();
+}
+
+
+void FUNCTION_NAME(Directory_Rename)(Dart_NativeArguments args) {
+  Dart_EnterScope();
+  Dart_Handle path = Dart_GetNativeArgument(args, 0);
+  Dart_Handle newPath = Dart_GetNativeArgument(args, 1);
+  if (Directory::Rename(DartUtils::GetStringValue(path),
+                        DartUtils::GetStringValue(newPath))) {
+    Dart_SetReturnValue(args, Dart_True());
+  } else {
+    Dart_Handle err = DartUtils::NewDartOSError();
+    if (Dart_IsError(err)) Dart_PropagateError(err);
+    Dart_SetReturnValue(args, err);
+  }
+  Dart_ExitScope();
 }
 
 
 static CObject* DirectoryCreateRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString path(request[1]);
     if (Directory::Create(path.CString())) {
       return CObject::True();
     } else {
       return CObject::NewOSError();
@@ skipping 75 matching lines @@
   Dart_PostCObject(response_port, response->AsApiCObject());
 
   response = new CObjectArray(CObject::NewArray(2));
   response->SetAt(
       0, new CObjectInt32(CObject::NewInt32(DirectoryListing::kListDone)));
   response->SetAt(1, CObject::False());
   return response;
 }
 
 
+static CObject* DirectoryRenameRequest(const CObjectArray& request,
+                                       Dart_Port response_port) {
+  if (request.Length() == 3 &&
+      request[1]->IsString() &&
+      request[2]->IsString()) {
+    CObjectString path(request[1]);
+    CObjectString new_path(request[2]);
+    bool completed = Directory::Rename(path.CString(), new_path.CString());
+    if (completed) return CObject::True();
+    return CObject::NewOSError();
+  }
+  return CObject::IllegalArgumentError();
+}
+
+
 void DirectoryService(Dart_Port dest_port_id,
                       Dart_Port reply_port_id,
                       Dart_CObject* message) {
   CObject* response = CObject::False();
   CObjectArray request(message);
   if (message->type == Dart_CObject::kArray) {
     if (request.Length() > 1 && request[0]->IsInt32()) {
       CObjectInt32 requestType(request[0]);
       switch (requestType.Value()) {
         case Directory::kCreateRequest:
           response = DirectoryCreateRequest(request);
           break;
         case Directory::kDeleteRequest:
           response = DirectoryDeleteRequest(request);
           break;
         case Directory::kExistsRequest:
           response = DirectoryExistsRequest(request);
           break;
         case Directory::kCreateTempRequest:
           response = DirectoryCreateTempRequest(request);
           break;
         case Directory::kListRequest:
           response = DirectoryListRequest(request, reply_port_id);
           break;
+        case Directory::kRenameRequest:
+          response = DirectoryRenameRequest(request, reply_port_id);
+          break;
         default:
           UNREACHABLE();
       }
     }
   }
 
   Dart_PostCObject(reply_port_id, response->AsApiCObject());
 }
 
 
@@ skipping 62 matching lines @@
 bool DirectoryListing::HandleError(const char* dir_name) {
   // TODO(sgjesse): Pass flags to indicate whether error
   // responses are needed.
   CObject* err = CObject::NewOSError();
   CObjectArray* response = new CObjectArray(CObject::NewArray(3));
   response->SetAt(0, new CObjectInt32(CObject::NewInt32(kListError)));
   response->SetAt(1, new CObjectString(CObject::NewString(dir_name)));
   response->SetAt(2, err);
   return Dart_PostCObject(response_port_, response->AsApiCObject());
 }