Fix compile on x86_64

Co-authored-by: weishu <twsxtd@gmail.com>
Signed-off-by: Tools-app <localhost.hutao@gmail.com>
This commit is contained in:
Tools-app
2025-11-22 09:18:07 +08:00
committed by 生于生时 亡于亡刻
parent d0e8faea77
commit 56a028d60d

View File

@@ -8,7 +8,12 @@ use libc::c_int;
use log::{error, warn};
#[cfg(unix)]
use std::os::unix::process::CommandExt;
use std::{env, ffi::CStr, path::PathBuf, process::Command};
use std::{
env,
ffi::{CStr, CString},
path::PathBuf,
process::Command,
};
#[cfg(any(target_os = "linux", target_os = "android"))]
use crate::ksucalls::get_wrapped_fd;
@@ -230,10 +235,9 @@ pub fn root_shell() -> Result<()> {
if free_idx < matches.free.len() {
let name = &matches.free[free_idx];
uid = unsafe {
#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
let pw = libc::getpwnam(name.as_ptr()).as_ref();
#[cfg(target_arch = "x86_64")]
let pw = libc::getpwnam(name.as_ptr() as *const i8).as_ref();
let pw = CString::new(name.as_str())
.ok()
.and_then(|c_name| libc::getpwnam(c_name.as_ptr()).as_ref());
pw.map_or_else(|| name.parse::<u32>().unwrap_or(0), |pw| pw.pw_uid)
}