diff --git a/src/elements/command.rs b/src/elements/command.rs index 99574472..ad01222a 100644 --- a/src/elements/command.rs +++ b/src/elements/command.rs @@ -32,7 +32,7 @@ pub trait Command { Ok(ForkResult::Child) => { core.initialize_as_subshell(Pid::from_raw(0), pipe.pgid); io::connect(pipe, self.get_redirects()); - self.run_command(core, true); + self.run(core, true); core.exit() }, Ok(ForkResult::Parent { child } ) => { @@ -46,14 +46,14 @@ pub trait Command { fn nofork_exec(&mut self, core: &mut ShellCore) { if self.get_redirects().iter_mut().all(|r| r.connect(true)){ - self.run_command(core, false); + self.run(core, false); }else{ core.vars.insert("?".to_string(), "1".to_string()); } self.get_redirects().iter_mut().rev().for_each(|r| r.restore()); } - fn run_command(&mut self, _: &mut ShellCore, fork: bool); + fn run(&mut self, _: &mut ShellCore, fork: bool); fn get_text(&self) -> String; fn get_redirects(&mut self) -> &mut Vec; fn set_force_fork(&mut self); diff --git a/src/elements/command/brace.rs b/src/elements/command/brace.rs index 884a5e75..4e4a85b4 100644 --- a/src/elements/command/brace.rs +++ b/src/elements/command/brace.rs @@ -24,7 +24,7 @@ impl Command for BraceCommand { } } - fn run_command(&mut self, core: &mut ShellCore, _: bool) { + fn run(&mut self, core: &mut ShellCore, _: bool) { match self.script { Some(ref mut s) => s.exec(core), _ => panic!("SUSH INTERNAL ERROR (ParenCommand::exec)"), diff --git a/src/elements/command/paren.rs b/src/elements/command/paren.rs index d594abb7..9751972c 100644 --- a/src/elements/command/paren.rs +++ b/src/elements/command/paren.rs @@ -18,7 +18,7 @@ impl Command for ParenCommand { self.fork_exec(core, pipe) } - fn run_command(&mut self, core: &mut ShellCore, fork: bool) { + fn run(&mut self, core: &mut ShellCore, fork: bool) { if ! fork { panic!("SUSH INTERNAL ERROR (no fork for subshell)"); } diff --git a/src/elements/command/simple.rs b/src/elements/command/simple.rs index cfd1694d..bf07ea46 100644 --- a/src/elements/command/simple.rs +++ b/src/elements/command/simple.rs @@ -42,7 +42,7 @@ impl Command for SimpleCommand { } } - fn run_command(&mut self, core: &mut ShellCore, fork: bool) { + fn run(&mut self, core: &mut ShellCore, fork: bool) { if ! fork { core.run_builtin(&mut self.args); return;