Fix

Author: ryuichiueda

error

@@ -125,3 +125,4 @@
 ./test_fixed.bash
 ./test_fixed.bash
 ./test_fixed.bash
+./test_fixed.bash

src/core/file_descs.rs

@@ -100,15 +100,9 @@ impl FileDescriptors {
         }
 
         if unsafe{dup2(from, to)} < 0 {
-            return Err(ExecError::Other("dup2 error".to_string()));
+            //return Err(ExecError::Other("dup2 error".to_string()));
+            return Err(ExecError:: BadFd(from));
         }
-        /*
-        if let Err(e) = unistd::dup2(from, to) {
-            return match e {
-                Errno::EBADF => Err(ExecError::BadFd(to)),
-                _ => Err(ExecError::Other("dup2 Unknown error".to_string())),
-            };
-        }*/
 
         Ok(())
     }

src/core/jobtable.rs

@@ -230,6 +230,15 @@ impl JobEntry {
 }
 
 impl ShellCore {
+    fn close_coproc(&mut self, pos: usize) {
+        self.job_table[pos].coproc_fds
+             .iter().for_each(|fd| {self.fds.close(*fd);});
+
+        let name = self.job_table[pos].coproc_name.clone().unwrap();
+        let _ = self.db.unset(&name, None);
+        let _ = self.db.unset(&(name + "_PID"), None);
+    }
+
     pub fn jobtable_check_status(&mut self) -> Result<(), ExecError> {
         if self.is_subshell {
             return Ok(());
@@ -244,14 +253,9 @@ impl ShellCore {
             }
 
             if  table.coproc_name.is_some() 
-            && (table.display_status == "Done" || table.display_status == "Killed") {
-                table.coproc_fds
-                     .iter()
-                     .for_each(|fd| {self.fds.close(*fd);});
-
-                let name = table.coproc_name.clone().unwrap();
-                let _ = self.db.unset(&name, None);
-                let _ = self.db.unset(&(name + "_PID"), None);
+            && (table.display_status == "Done" 
+                || table.display_status == "Killed") {
+                self.close_coproc(i);
             }
         }
 

src/elements/command/coproc.rs

@@ -3,13 +3,16 @@
 
 use super::{Command, Pipe, Redirect};
 use crate::elements::command;
-use crate::elements::command::{BraceCommand, IfCommand, ParenCommand, WhileCommand};
+use crate::elements::command::{
+    BraceCommand, IfCommand, ParenCommand, SimpleCommand, WhileCommand
+};
 use crate::error::exec::ExecError;
 use crate::error::parse::ParseError;
 use crate::utils;
 use crate::{Feeder, ShellCore};
 use nix::unistd::Pid;
 use nix::sys::wait::WaitStatus;
+//use std::{thread, time};
 use crate::core::jobtable::JobEntry;
 
 #[derive(Debug, Clone, Default)]
@@ -87,6 +90,8 @@ impl Command for Coprocess {
         core.job_table.push(entry);
         core.tty_fd = backup;
 
+        //thread::sleep(time::Duration::from_millis(100));
+        //core.jobtable_check_status()?;
         Ok(None)
     }
 
@@ -162,20 +167,42 @@ impl Coprocess {
         Ok(())
     }
 
+    fn parse_simple_command(feeder: &mut Feeder,
+        core: &mut ShellCore
+    ) -> Result<Option<Self>, ParseError> {
+        let mut ans = Self::default();
+        ans.text += &feeder.consume(6);
+        command::eat_blank_with_comment(feeder, core, &mut ans.text);
+
+        ans.command = if let Some(a) = SimpleCommand::parse(feeder, core)? {
+            ans.text += &a.get_text();
+            ans.name = "COPROC".to_string();
+            Some(a)
+        }else{
+            return Err(ParseError::UnexpectedSymbol("coproc".to_string()));
+        };
+
+        Ok(Some(ans))
+    }
+
     pub fn parse(feeder: &mut Feeder, core: &mut ShellCore) -> Result<Option<Self>, ParseError> {
         if ! feeder.starts_with("coproc") {
             return Ok(None);
         }
         let mut ans = Self::default();
         ans.lineno = feeder.lineno;
 
+        feeder.set_backup();
+
         ans.eat_header(feeder, core)?;
         ans.eat_body(feeder, core)?;
 
         if ans.command.is_some() {
+            feeder.pop_backup();
             Ok(Some(ans))
         } else {
-            Ok(None)
+            feeder.rewind();
+            Self::parse_simple_command(feeder, core)
         }
     }
 }

src/elements/io/redirect.rs

@@ -146,7 +146,8 @@ impl Redirect {
         core.fds.share(right_fd, self.left_fd)
     }
 
-    fn redirect_input_fd(&mut self, restore: bool, core: &mut ShellCore) -> Result<(), ExecError> {
+    fn redirect_input_fd(&mut self, restore: bool,
+                         core: &mut ShellCore) -> Result<(), ExecError> {
         if self.right.text == "-" {
             self.set_left_fd(0);
             core.fds.close(self.left_fd);