Compare commits
3 commits
5df428a364
...
1270576444
Author | SHA1 | Date | |
---|---|---|---|
1270576444 | |||
a16ed0e030 | |||
abd857f0e4 |
4 changed files with 60 additions and 17 deletions
|
@ -19,3 +19,4 @@ I want to learn Rust and see how much effort I can put into making an interopera
|
|||
- [ ] PS1
|
||||
- [ ] Execute code from a file
|
||||
- [ ] Clean error handling
|
||||
- [ ] Override Ctrl-C
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
use crate::{error::print_error, exit_code::ExitCode};
|
||||
use crate::error;
|
||||
use crate::error::CdError;
|
||||
use crate::exit_code::ExitCode;
|
||||
|
||||
use std::env;
|
||||
use std::{env::set_current_dir, path::PathBuf};
|
||||
|
@ -17,18 +19,20 @@ pub(super) fn cd(args: &Vec<String>) -> ExitCode {
|
|||
|
||||
let exit_code: ExitCode;
|
||||
if path.is_some() {
|
||||
exit_code = match set_current_dir(path.unwrap()) {
|
||||
Ok(()) => ExitCode::success(),
|
||||
Err(_e) => ExitCode::new(2),
|
||||
};
|
||||
let path = path.unwrap();
|
||||
let result = set_current_dir(&path);
|
||||
|
||||
if result.is_err() {
|
||||
let error = CdError::new(&args[0]);
|
||||
error::print(Box::new(error));
|
||||
exit_code = ExitCode::new(2);
|
||||
} else {
|
||||
exit_code = ExitCode::success();
|
||||
}
|
||||
} else {
|
||||
exit_code = ExitCode::success();
|
||||
}
|
||||
|
||||
if exit_code.get() != 0 {
|
||||
print_error("lol");
|
||||
}
|
||||
|
||||
exit_code
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,8 @@ mod builtins;
|
|||
pub mod command_builder;
|
||||
pub mod command_sequence;
|
||||
|
||||
use crate::error::print_error;
|
||||
use crate::error;
|
||||
use crate::error::CommandNotFoundError;
|
||||
use crate::exit_code::ExitCode;
|
||||
|
||||
type BuiltinFunction = fn(&Vec<String>) -> ExitCode;
|
||||
|
@ -81,11 +82,8 @@ impl Command for UnixProgram {
|
|||
|
||||
exit_code
|
||||
} else {
|
||||
let message = format!(
|
||||
"{}: command not found",
|
||||
self.command.get_program().to_str().unwrap()
|
||||
);
|
||||
print_error(message.as_str());
|
||||
let error = CommandNotFoundError::new(self.command.get_program().to_str().unwrap());
|
||||
error::print(Box::new(error));
|
||||
ExitCode::not_found()
|
||||
}
|
||||
}
|
||||
|
|
44
src/error.rs
44
src/error.rs
|
@ -1,9 +1,49 @@
|
|||
use std::env;
|
||||
use std::fmt;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::path::Path;
|
||||
|
||||
pub fn print_error(message: &str) {
|
||||
type Error = Box<dyn Display>;
|
||||
|
||||
pub struct CdError {
|
||||
entry_name: String,
|
||||
}
|
||||
|
||||
impl CdError {
|
||||
pub fn new(entry_name: &str) -> Self {
|
||||
Self {
|
||||
entry_name: String::from(entry_name),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for CdError {
|
||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||
write!(f, "cd: no such directory as '{}'", self.entry_name)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct CommandNotFoundError {
|
||||
command: String,
|
||||
}
|
||||
|
||||
impl CommandNotFoundError {
|
||||
pub fn new(command: &str) -> Self {
|
||||
Self {
|
||||
command: String::from(command),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for CommandNotFoundError {
|
||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||
write!(f, "{}: command not found", self.command)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn print(error: Error) {
|
||||
let name = env::args().next().unwrap_or(String::from("rash"));
|
||||
let name = Path::new(&name).file_name().unwrap().to_str().unwrap();
|
||||
|
||||
eprintln!("{}: {}", name, message);
|
||||
eprintln!("{}: {}", name, error);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue