Revert execvpe on Mac and fix usage of strerror_r.

runtime/bin/process_macos.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 "platform/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include "bin/process.h"
 
 #include <crt_externs.h>  // NOLINT
 #include <errno.h>  // NOLINT
 #include <fcntl.h>  // NOLINT
 #include <poll.h>  // NOLINT
 #include <signal.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
 #include <string.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 
 #include "bin/fdutils.h"
 #include "bin/lockers.h"
 #include "bin/log.h"
 #include "bin/thread.h"
 
 #include "platform/signal_blocker.h"
 
 
+extern char** environ;
+
+
 namespace dart {
 namespace bin {
 
 // ProcessInfo is used to map a process id to the file descriptor for
 // the pipe used to communicate the exit code of the process to Dart.
 // ProcessInfo objects are kept in the static singly-linked
 // ProcessInfoList.
 class ProcessInfo {
  public:
   ProcessInfo(pid_t pid, intptr_t fd) : pid_(pid), fd_(fd) { }
@@ skipping 404 matching lines @@
     if (TEMP_FAILURE_RETRY(dup2(read_err_[1], STDERR_FILENO)) == -1) {
       ReportChildError();
     }
 
     if (working_directory_ != NULL &&
         TEMP_FAILURE_RETRY(chdir(working_directory_)) == -1) {
       ReportChildError();
     }
 
     if (program_environment_ != NULL) {
-      VOID_TEMP_FAILURE_RETRY(
-          execvpe(path_, const_cast<char* const*>(program_arguments_),
-                  program_environment_));
-    } else {
-      VOID_TEMP_FAILURE_RETRY(
-          execvp(path_, const_cast<char* const*>(program_arguments_)));
+      environ = program_environment_;
     }
 
+    VOID_TEMP_FAILURE_RETRY(
+        execvp(path_, const_cast<char* const*>(program_arguments_)));
+
     ReportChildError();
   }
 
 
   void ExecDetachedProcess() {
     if (mode_ == kDetached) {
       ASSERT(write_out_[0] == -1);
       ASSERT(write_out_[1] == -1);
       ASSERT(read_err_[0] == -1);
       ASSERT(read_err_[1] == -1);
@@ skipping 205 matching lines @@
     int bytes_written =
         FDUtils::WriteToBlocking(exec_control_[1], &pid, sizeof(pid));
     ASSERT(bytes_written == sizeof(int));
     USE(bytes_written);
   }
 
 
   void SetOSErrorMessage(int child_errno) {
     const int kMaxMessageSize = 256;
     char* message = static_cast<char*>(calloc(kMaxMessageSize, 0));
-    char* os_error_message = strerror_r(
-        child_errno, message, kMaxMessageSize - 1);
-    if (message == os_error_message) {
-      *os_error_message_ = message;
-    } else {
-      free(message);
-      *os_error_message_ = strdup(os_error_message);
-    }
+    strerror_r(child_errno, message, kMaxMessageSize - 1);
+    *os_error_message_ = message;
   }
 
 
   void ClosePipe(int* fds) {
     for (int i = 0; i < 2; i++) {
       if (fds[i] != -1) {
         VOID_TEMP_FAILURE_RETRY(close(fds[i]));
         fds[i] = -1;
       }
     }
@@ skipping 344 matching lines @@
     bzero(&act, sizeof(act));
     act.sa_handler = SIG_DFL;
     VOID_NO_RETRY_EXPECTED(sigaction(signal, &act, NULL));
   }
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)