---

yaml
---
r: 11672
b: refs/heads/master
c: e957185
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0e3dd5a3ee170482f8e314b3f37aa2d1cc8da58c
+refs/heads/master: e9571850daded0f46ae3b9b8e0834b6be2e5219b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/libc.rs

@@ -1100,10 +1100,11 @@ mod funcs {
 
         #[abi = "stdcall"]
         native mod kernel32 {
-            fn GetEnvironmentVariableA(n: LPCSTR,
-                                       v: LPSTR,
+            fn GetEnvironmentVariableW(n: LPCWSTR,
+                                       v: LPWSTR,
                                        nsize: DWORD) -> DWORD;
-            fn SetEnvironmentVariableA(n: LPCSTR, v: LPCSTR) -> BOOL;
+            fn SetEnvironmentVariableW(n: LPCWSTR, v: LPCWSTR) -> BOOL;
+
             fn GetModuleFileNameA(hModule: HMODULE,
                                   lpFilename: LPSTR,
                                   nSize: DWORD) -> DWORD;

trunk/src/libcore/os.rs

@@ -50,7 +50,17 @@ fn as_c_charp<T>(s: str, f: fn(*c_char) -> T) -> T {
     str::as_buf(s) {|b| f(b as *c_char) }
 }
 
-// FIXME: UTF-16-ify this and revive win32 Unicode variant.
+fn as_utf16_p<T>(s: str, f: fn(*u16) -> T) -> T {
+    let t = str::to_utf16(s);
+    // "null terminate"
+    t += [0u16];
+    vec::as_buf(t, f)
+}
+
+
+#[cfg(target_os = "linux")]
+#[cfg(target_os = "macos")]
+#[cfg(target_os = "freebsd")]
 fn getenv(n: str) -> option<str> unsafe {
     let s = as_c_charp(n, libc::getenv);
     ret if unsafe::reinterpret_cast(s) == 0 {
@@ -61,6 +71,27 @@ fn getenv(n: str) -> option<str> unsafe {
         };
 }
 
+#[cfg(target_os = "win32")]
+fn getenv(n: str) -> option<str> unsafe {
+    import libc::types::os::arch::extra::*;
+    import libc::funcs::extra::kernel32;
+    as_utf16_p(n) {|u|
+        let bufsize = 1023u;
+        let buf = vec::to_mut(vec::init_elt(bufsize, 0u16));
+        vec::as_mut_buf(buf) {|b|
+            let k = kernel32::GetEnvironmentVariableW(u, b,
+                                                      bufsize as DWORD);
+            if k != (0 as DWORD) {
+                let sub = vec::slice(buf, 0u, k as uint);
+                option::some::<str>(str::from_utf16(sub))
+            } else {
+                option::none::<str>
+            }
+        }
+    }
+}
+
+
 #[cfg(target_os = "linux")]
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
@@ -78,13 +109,12 @@ fn setenv(n: str, v: str) {
 
 
 #[cfg(target_os = "win32")]
-// FIXME: UTF-16-ify this and switch to the W version.
 fn setenv(n: str, v: str) {
     // FIXME: remove imports when export globs work properly.
     import libc::funcs::extra::kernel32;
-    as_c_charp(n) {|nbuf|
-        as_c_charp(v) {|vbuf|
-            kernel32::SetEnvironmentVariableA(nbuf, vbuf);
+    as_utf16_p(n) {|nbuf|
+        as_utf16_p(v) {|vbuf|
+            kernel32::SetEnvironmentVariableW(nbuf, vbuf);
         }
     }
 }

trunk/src/libcore/str.rs

@@ -1047,7 +1047,7 @@ Function: is_utf8
 
 Determines if a vector of bytes contains valid UTF-8
 */
-fn is_utf8(v: [u8]) -> bool {
+fn is_utf8(v: [const u8]) -> bool {
     let i = 0u;
     let total = vec::len::<u8>(v);
     while i < total {
@@ -1065,7 +1065,7 @@ fn is_utf8(v: [u8]) -> bool {
 }
 
 
-fn is_utf16(v: [u16]) -> bool {
+fn is_utf16(v: [const u16]) -> bool {
     let len = v.len();
     let i = 0u;
     while (i < len) {
@@ -1108,10 +1108,10 @@ fn to_utf16(s: str) -> [u16] {
     ret u;
 }
 
-fn utf16_chars(v: [u16], f: fn(char)) {
+fn utf16_chars(v: [const u16], f: fn(char)) {
     let len = v.len();
     let i = 0u;
-    while (i < len) {
+    while (i < len && v[i] != 0u16) {
         let u = v[i];
 
         if  u <= 0xD7FF_u16 || u >= 0xE000_u16 {
@@ -1133,7 +1133,7 @@ fn utf16_chars(v: [u16], f: fn(char)) {
 }
 
 
-fn from_utf16(v: [u16]) -> str {
+fn from_utf16(v: [const u16]) -> str {
     let buf = "";
     reserve(buf, v.len());
     utf16_chars(v) {|ch| push_char(buf, ch); }