RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 21:47:46 +00:00
Code Issues Activity

Merge pull request #2383 from tertsdiepraam/whoami/use-winapi

Browse source 
`whoami`: remove `advapi32-sys` dependency and use `winapi`
This commit is contained in:
Sylvestre Ledru 2021-06-10 21:34:50 +02:00 • committed by GitHub
commit be9104b084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -6,16 +6,6 @@ version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
[[package]]
name = "advapi32-sys"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
dependencies = [
"winapi 0.2.8",
"winapi-build",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.18" version = "0.7.18"
@ -2754,7 +2744,6 @@ dependencies = [
name = "uu_whoami" name = "uu_whoami"
version = "0.0.6" version = "0.0.6"
dependencies = [ dependencies = [
"advapi32-sys",
"clap", "clap",
"uucore", "uucore",
"uucore_procs", "uucore_procs",

1
src/uu/whoami/Cargo.toml
View file

@ -20,7 +20,6 @@ uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["
uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
advapi32-sys = "0.2.0"
winapi = { version = "0.3", features = ["lmcons"] } winapi = { version = "0.3", features = ["lmcons"] }
[[bin]] [[bin]]

4
src/uu/whoami/src/platform/windows.rs
View file

@ -11,7 +11,7 @@ extern crate winapi;
use self::winapi::shared::lmcons; use self::winapi::shared::lmcons;
use self::winapi::shared::minwindef; use self::winapi::shared::minwindef;
use self::winapi::um::winnt; use self::winapi::um::{winbase, winnt};
use std::io::{Error, Result}; use std::io::{Error, Result};
use std::mem; use std::mem;
use uucore::wide::FromWide; use uucore::wide::FromWide;
@ -20,7 +20,7 @@ pub unsafe fn get_username() -> Result<String> {
#[allow(deprecated)] #[allow(deprecated)]
let mut buffer: [winnt::WCHAR; lmcons::UNLEN as usize + 1] = mem::uninitialized(); let mut buffer: [winnt::WCHAR; lmcons::UNLEN as usize + 1] = mem::uninitialized();
let mut len = buffer.len() as minwindef::DWORD; let mut len = buffer.len() as minwindef::DWORD;
if advapi32::GetUserNameW(buffer.as_mut_ptr(), &mut len) == 0 { if winbase::GetUserNameW(buffer.as_mut_ptr(), &mut len) == 0 {
return Err(Error::last_os_error()); return Err(Error::last_os_error());
} }
let username = String::from_wide(&buffer[..len as usize - 1]); let username = String::from_wide(&buffer[..len as usize - 1]);