Merge #282

282: Add support for "x86_64-pc-windows-msvc". r=reitermarkus a=DiXN



Co-authored-by: Michael Kaltschmid <[email protected]>
Co-authored-by: Markus Reiter <[email protected]>

Author: 3 people

Cargo.lock

@@ -16,3 +16,6 @@ libc = "0.2.18"
 rustc_version = "0.2.1"
 semver = "0.9.0"
 toml = "0.2.1"
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3.7", features = ["winbase"] }

Cargo.toml

@@ -1,15 +1,56 @@
+#[cfg(not(target_os = "windows"))]
+use libc;
+#[cfg(not(target_os = "windows"))]
 use std::ffi::CStr;
 
-use libc;
+#[cfg(target_os = "windows")]
+pub fn group() -> u32 {
+    1000
+}
 
+#[cfg(not(target_os = "windows"))]
 pub fn group() -> u32 {
     unsafe { libc::getgid() }
 }
 
+#[cfg(target_os = "windows")]
+pub fn user() -> u32 {
+    1000
+}
+
+#[cfg(not(target_os = "windows"))]
 pub fn user() -> u32 {
     unsafe { libc::getuid() }
 }
 
+#[cfg(target_os = "windows")]
+pub fn username() -> String {
+    use std::ptr;
+
+    use winapi::um::winbase::GetUserNameW;
+
+    unsafe {
+        let mut size = 0;
+        GetUserNameW(ptr::null_mut(), &mut size);
+
+        if size == 0 {
+            return "".to_owned()
+        }
+
+        let mut username = Vec::with_capacity(size as usize);
+
+        if GetUserNameW(username.as_mut_ptr(), &mut size) == 0 {
+            return "".to_owned();
+        }
+
+        // Remove null terminator.
+        username.set_len((size - 1) as usize);
+
+        String::from_utf16(&username).unwrap()
+    }
+}
+
+#[cfg(not(target_os = "windows"))]
 pub fn username() -> String {
     unsafe {
         CStr::from_ptr((*libc::getpwuid(user())).pw_name)

src/id.rs

@@ -9,6 +9,9 @@ extern crate rustc_version;
 extern crate semver;
 extern crate toml;
 
+#[cfg(target_os = "windows")]
+extern crate winapi;
+
 mod cargo;
 mod cli;
 mod docker;
@@ -40,6 +43,9 @@ pub enum Host {
 
     // Linux
     X86_64UnknownLinuxGnu,
+
+    // Windows MSVC
+    X86_64PcWindowsMsvc
 }
 
 impl Host {
@@ -51,6 +57,8 @@ impl Host {
             target.map(|t| t.triple() == "i686-apple-darwin" || t.needs_docker()).unwrap_or(false)
         } else if *self == Host::X86_64UnknownLinuxGnu {
             target.map(|t| t.needs_docker()).unwrap_or(true)
+        } else if *self == Host::X86_64PcWindowsMsvc {
+            target.map(|t| t.needs_docker()).unwrap_or(false)
         } else {
             false
         }
@@ -60,7 +68,8 @@ impl Host {
         match *self {
             Host::X86_64AppleDarwin => "x86_64-apple-darwin",
             Host::X86_64UnknownLinuxGnu => "x86_64-unknown-linux-gnu",
-            Host::Other => unimplemented!(),
+            Host::X86_64PcWindowsMsvc => "x86_64-pc-windows-msvc",
+            Host::Other => unimplemented!()
         }
     }
 }
@@ -70,6 +79,7 @@ impl<'a> From<&'a str> for Host {
         match s {
             "x86_64-apple-darwin" => Host::X86_64AppleDarwin,
             "x86_64-unknown-linux-gnu" => Host::X86_64UnknownLinuxGnu,
+            "x86_64-pc-windows-msvc" => Host::X86_64PcWindowsMsvc,
             _ => Host::Other,
         }
     }
@@ -161,7 +171,8 @@ impl From<Host> for Target {
         match host {
             Host::X86_64UnknownLinuxGnu => Target::new_built_in("x86_64-unknown-linux-gnu"),
             Host::X86_64AppleDarwin => Target::new_built_in("x86_64-apple-darwin"),
-            Host::Other => unreachable!(),
+            Host::X86_64PcWindowsMsvc => Target::new_built_in("x86_64-pc-windows-msvc"),
+            Host::Other => unimplemented!(),
         }
     }
 }