chroot: remove unwrap calls #7890
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
GNU testsuite comparison: |
sylvestre
reviewed
May 6, 2025
src/uu/chroot/src/chroot.rs
Outdated
| @@ -439,7 +439,9 @@ fn enter_chroot(root: &Path, skip_chdir: bool) -> UResult<()> { | |||
| let err = unsafe { | |||
| chroot( | |||
| CString::new(root.as_os_str().as_bytes().to_vec()) | |||
| .unwrap() | |||
| .map_err(|e| { | |||
| ChrootError::CannotEnter("Unable to enter root directory".to_string(), e.into()) | |||
There was a problem hiding this comment.
i don't think the "unable to enter..." string should be passed
coreutils/src/uu/chroot/src/error.rs
Line 17 in 9d9f2c9
the first arg is the path (so, root here)
There was a problem hiding this comment.
Got it, I'll fix that. Sorry for the delay, I've been on vacation!
|
@jovielarue ping ? :) |
|
GNU testsuite comparison: |
sylvestre
pushed a commit
to sylvestre/coreutils
that referenced
this pull request
Jun 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aims to solve #7876. I have not found the underlying problem to that issue, but I have removed the unwrap() calls on lines 442 and 451 as mentioned in #7876 so that the code aligns with the "never use panic!" guideline.