Skip to content

chroot: remove unwrap calls #7890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 28, 2025
Merged

chroot: remove unwrap calls #7890

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d9f2c9
chroot: remove unwrap calls
jovielarue May 6, 2025
bbc682d
chroot: fix error string
jovielarue May 24, 2025
afd0e6c
Merge branch 'uutils:main' into fix-unwrap
jovielarue May 24, 2025
b8cabb9
Fix: git issue
jovielarue May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/uu/chroot/src/chroot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@
let err = unsafe {
chroot(
CString::new(root.as_os_str().as_bytes().to_vec())
.unwrap()
.map_err(|e| ChrootError::CannotEnter("root".to_string(), e.into()))?
.as_bytes_with_nul()
.as_ptr()
.cast::<libc::c_char>(),
Expand All @@ -448,7 +448,7 @@

if err == 0 {
if !skip_chdir {
std::env::set_current_dir("/").unwrap();
std::env::set_current_dir("/")?;

Check warning on line 451 in src/uu/chroot/src/chroot.rs

View check run for this annotation

Codecov / codecov/patch

src/uu/chroot/src/chroot.rs#L451 

Added line #L451 was not covered by tests
}
Ok(())
} else {
Expand Down
Loading