OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "platform/globals.h" | 5 #include "platform/globals.h" |
6 #if defined(TARGET_OS_ANDROID) | 6 #if defined(TARGET_OS_ANDROID) |
7 | 7 |
8 #include <errno.h> // NOLINT | 8 #include <errno.h> // NOLINT |
9 #include <netdb.h> // NOLINT | 9 #include <netdb.h> // NOLINT |
10 #include <sys/time.h> // NOLINT | 10 #include <sys/time.h> // NOLINT |
11 | 11 |
12 #include "bin/utils.h" | 12 #include "bin/utils.h" |
13 #include "platform/assert.h" | 13 #include "platform/assert.h" |
14 | 14 |
15 | 15 |
16 namespace dart { | 16 namespace dart { |
17 namespace bin { | 17 namespace bin { |
18 | 18 |
19 OSError::OSError() : sub_system_(kSystem), code_(0), message_(NULL) { | 19 OSError::OSError() : sub_system_(kSystem), code_(0), message_(NULL) { |
20 set_sub_system(kSystem); | 20 set_sub_system(kSystem); |
21 set_code(errno); | 21 set_code(errno); |
22 SetMessage(strerror(errno)); | 22 const int kBufferSize = 1024; |
| 23 char error_message[kBufferSize]; |
| 24 strerror_r(errno, error_message, kBufferSize); |
| 25 SetMessage(error_message); |
23 } | 26 } |
24 | 27 |
25 | 28 |
26 void OSError::SetCodeAndMessage(SubSystem sub_system, int code) { | 29 void OSError::SetCodeAndMessage(SubSystem sub_system, int code) { |
27 set_sub_system(sub_system); | 30 set_sub_system(sub_system); |
28 set_code(code); | 31 set_code(code); |
29 if (sub_system == kSystem) { | 32 if (sub_system == kSystem) { |
30 SetMessage(strerror(code)); | 33 const int kBufferSize = 1024; |
| 34 char error_message[kBufferSize]; |
| 35 strerror_r(code, error_message, kBufferSize); |
| 36 SetMessage(error_message); |
31 } else if (sub_system == kGetAddressInfo) { | 37 } else if (sub_system == kGetAddressInfo) { |
32 SetMessage(gai_strerror(code)); | 38 SetMessage(gai_strerror(code)); |
33 } else { | 39 } else { |
34 UNREACHABLE(); | 40 UNREACHABLE(); |
35 } | 41 } |
36 } | 42 } |
37 | 43 |
38 const char* StringUtils::ConsoleStringToUtf8(const char* str) { | 44 const char* StringUtils::ConsoleStringToUtf8(const char* str) { |
39 return str; | 45 return str; |
40 } | 46 } |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 } | 98 } |
93 | 99 |
94 void TimerUtils::Sleep(int64_t millis) { | 100 void TimerUtils::Sleep(int64_t millis) { |
95 usleep(millis * 1000); | 101 usleep(millis * 1000); |
96 } | 102 } |
97 | 103 |
98 } // namespace bin | 104 } // namespace bin |
99 } // namespace dart | 105 } // namespace dart |
100 | 106 |
101 #endif // defined(TARGET_OS_ANDROID) | 107 #endif // defined(TARGET_OS_ANDROID) |
OLD | NEW |