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_WINDOWS) | 6 #if defined(TARGET_OS_WINDOWS) |
7 | 7 |
8 #include "bin/platform.h" | 8 #include "bin/platform.h" |
9 #include "bin/log.h" | 9 #include "bin/log.h" |
10 #include "bin/socket.h" | 10 #include "bin/socket.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 return gethostname(buffer, buffer_length) == 0; | 37 return gethostname(buffer, buffer_length) == 0; |
38 } | 38 } |
39 | 39 |
40 | 40 |
41 char** Platform::Environment(intptr_t* count) { | 41 char** Platform::Environment(intptr_t* count) { |
42 wchar_t* strings = GetEnvironmentStringsW(); | 42 wchar_t* strings = GetEnvironmentStringsW(); |
43 if (strings == NULL) return NULL; | 43 if (strings == NULL) return NULL; |
44 wchar_t* tmp = strings; | 44 wchar_t* tmp = strings; |
45 intptr_t i = 0; | 45 intptr_t i = 0; |
46 while (*tmp != '\0') { | 46 while (*tmp != '\0') { |
47 i++; | 47 // Skip environment strings starting with "=". |
| 48 // These are synthetic variables corresponding to dynamic environment |
| 49 // variables like %=C:% and %=ExitCode%, and the Dart environment does |
| 50 // not include these. |
| 51 if (*tmp != '=') i++; |
48 tmp += (wcslen(tmp) + 1); | 52 tmp += (wcslen(tmp) + 1); |
49 } | 53 } |
50 *count = i; | 54 *count = i; |
51 char** result = new char*[i]; | 55 char** result = new char*[i]; |
52 tmp = strings; | 56 tmp = strings; |
53 for (intptr_t current = 0; current < i; current++) { | 57 for (intptr_t current = 0; current < i;) { |
54 result[current] = StringUtils::WideToUtf8(tmp); | 58 // Skip the strings that were not counted above. |
| 59 if (*tmp != '=') result[current++] = StringUtils::WideToUtf8(tmp); |
55 tmp += (wcslen(tmp) + 1); | 60 tmp += (wcslen(tmp) + 1); |
56 } | 61 } |
57 FreeEnvironmentStringsW(strings); | 62 FreeEnvironmentStringsW(strings); |
58 return result; | 63 return result; |
59 } | 64 } |
60 | 65 |
61 | 66 |
62 void Platform::FreeEnvironment(char** env, intptr_t count) { | 67 void Platform::FreeEnvironment(char** env, intptr_t count) { |
63 for (intptr_t i = 0; i < count; i++) { | 68 for (intptr_t i = 0; i < count; i++) { |
64 free(env[i]); | 69 free(env[i]); |
65 } | 70 } |
66 delete[] env; | 71 delete[] env; |
67 } | 72 } |
68 | 73 |
69 } // namespace bin | 74 } // namespace bin |
70 } // namespace dart | 75 } // namespace dart |
71 | 76 |
72 #endif // defined(TARGET_OS_WINDOWS) | 77 #endif // defined(TARGET_OS_WINDOWS) |
OLD | NEW |