Mirrors/lemurs
2
0
Fork 0
mirror of https://github.com/coastalwhite/lemurs synced 2024-11-22 10:03:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Several unwraps properly handled

Browse source
This commit is contained in:
Gijs Burghoorn 2023-03-30 22:22:41 +02:00
parent 86e3272ac1
commit 8ad557d105
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/post_login/mod.rs
View file

@ -76,11 +76,15 @@ impl From<XSetupError> for EnvironmentStartError {
}
fn output_command_to_log(mut command: Command, log_path: &Path) -> Command {
let fd = File::create(log_path).unwrap().into_raw_fd();
if let Ok(file) = File::create(log_path) {
let fd = file.into_raw_fd();
command
.stdout(unsafe { Stdio::from_raw_fd(fd) })
.stderr(unsafe { Stdio::from_raw_fd(fd) });
command
.stdout(unsafe { Stdio::from_raw_fd(fd) })
.stderr(unsafe { Stdio::from_raw_fd(fd) });
} else {
warn!("Failed to create and open file to log into");
}
command
}
@ -92,7 +96,10 @@ fn lower_command_permissions_to_user(
let uid = user_info.uid;
let gid = user_info.gid;
let groups: Vec<Gid> = get_user_groups(&user_info.name, gid)
.unwrap()
.unwrap_or_else(|| {
error!("Failed to get user groups. This should not happen here...");
std::process::exit(1);
})
.iter()
.map(|group| Gid::from_raw(group.gid()))
.collect();

31
src/ui/mod.rs
View file

@ -511,21 +511,22 @@ impl LoginForm {
while let Ok(request) = req_recv_channel.recv() {
match request {
UIThreadRequest::Redraw => {
terminal
.draw(|f| {
let layout = Chunks::new(f);
login_form_render(
f,
layout,
power_menu.clone(),
environment.clone(),
username.clone(),
password.clone(),
input_mode.get(),
status_message.get(),
);
})
.unwrap();
match terminal.draw(|f| {
let layout = Chunks::new(f);
login_form_render(
f,
layout,
power_menu.clone(),
environment.clone(),
username.clone(),
password.clone(),
input_mode.get(),
status_message.get(),
);
}) {
Ok(_) => {}
Err(err) => warn!("Failed to draw to screen. Reason: {err}"),
}
}
UIThreadRequest::DisableTui => {
disable_raw_mode()?;