Skip to content
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

Update cd command to use correct path traversal from the path crate to allow for parent directory #1104

Merged
merged 16 commits into from
Sep 9, 2024
Merged

Update cd command to use correct path traversal from the path crate to allow for parent directory #1104

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e185ac3
Initial parent directory command
Aug 28, 2024
bd1b82f
Remove '-p' argument in place with '..'
Aug 28, 2024
2d6cfcb
Clean up syntax
Aug 28, 2024
d7307bf
Update parent flag in print usage option
Aug 28, 2024
2d6eeda
Remove verbose print statement
Aug 28, 2024
e94fa9e
Remove unnecessary space
Aug 28, 2024
df05211
Attempt to move parent directory logic to kernel
Aug 31, 2024
6aff644
Remove unnecessary Path crate and copy of working directory
Sep 2, 2024
9e10ed5
Remove extra line
Sep 2, 2024
e316ed1
Synatx
Sep 2, 2024
46faeb5
fix line
Sep 2, 2024
eb682f4
Call get function from path crate to add correctory directory
Sep 6, 2024
f9ea294
Merge branch 'nathan/parent' into nathan/cd
Sep 6, 2024
531c847
Remove redundant harded parent directory check
Sep 6, 2024
e06c19b
Replace redundant function:
Sep 6, 2024
dbdcf06
Remove extra line
Sep 6, 2024
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
15 changes: 6 additions & 9 deletions kernel/environment/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@ impl Environment {
/// Changes the current working directory.
#[doc(alias("change"))]
pub fn chdir(&mut self, path: &Path) -> Result<()> {
for component in path.components() {
let new = self.working_dir.lock().get(component.as_ref());
match new {
Some(FileOrDir::Dir(dir)) => {
self.working_dir = dir;
}
Some(FileOrDir::File(_)) => return Err(Error::NotADirectory),
None => return Err(Error::NotFound),
match path.get(&self.working_dir) {
Some(FileOrDir::Dir(dir)) => {
self.working_dir = dir;
Ok(())
}
Some(FileOrDir::File(_)) => Err(Error::NotADirectory),
None => Err(Error::NotFound),
}
Ok(())
}

/// Returns the value of the environment variable with the given `key`.
Expand Down
Loading