- Add OS::StrNDup instead of redefining it when needed.

runtime/vm/os_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 "vm/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include "vm/os.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 117 matching lines @@
 
 void OS::DebugBreak() {
 #if defined(HOST_ARCH_X64) || defined(HOST_ARCH_IA32)
   asm("int $3");
 #else
 #error Unsupported architecture.
 #endif
 }
 
 
+char* OS::StrNDup(const char* s, intptr_t n) {
+  // strndup has only been added to Mac OS X in 10.7. We are supplying
+  // our own copy here if needed.
+#if !defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) || \
+    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ <= 1060
+  intptr_t len = strlen(s);
+  if ((n < 0) || (len < 0)) {
+    return NULL;
+  }
+  if (n < len) {
+    len = n;
+  }
+  char* result = reinterpret_cast<char*>(malloc(len + 1));
+  if (result == NULL) {
+    return NULL;
+  }
+  result[len] = '\0';
+  return reinterpret_cast<char*>(memcpy(result, s, len));
+#else  // !defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)

[Vyacheslav Egorov (Google), 2013/04/12 16:10:34]

comment does not really match condition.

[Ivan Posva, 2013/04/12 16:19:00]

Extended comment with " || ...".

+  return strndup(s, n);
+#endif  // !defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+}
+
+
 void OS::Print(const char* format, ...) {
   va_list args;
   va_start(args, format);
   VFPrint(stdout, format, args);
   va_end(args);
 }
 
 
 void OS::VFPrint(FILE* stream, const char* format, va_list args) {
   vfprintf(stream, format, args);
@@ skipping 69 matching lines @@
 }
 
 
 void OS::Exit(int code) {
   exit(code);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)