Refactor

Author: ryuichiueda

src/core/builtins/job_commands.rs

@@ -333,64 +333,3 @@ fn wait_arg_job(
 
     Ok((127, false))
 }
-
-fn wait_all(core: &mut ShellCore) -> Result<i32, ExecError> {
-    let mut exit_status = 0;
-    let mut remove_list = vec![];
-    for pos in 0..core.job_table.len() {
-        let result = core.job_table[pos].nonblock_wait(&core.sigint)?;
-        exit_status = result.0;
-        if result.1 { 
-            remove_list.push(pos);
-        }
-    }
-
-    for pos in remove_list.into_iter().rev() {
-        remove(core, pos);
-    }
-
-    Ok(exit_status)
-}
-
-/*
-fn wait_n(
-    core: &mut ShellCore,
-    args: &mut Vec<String>,
-    var_name: &Option<String>,
-    f_opt: bool,
-) -> Result<i32, ExecError> {
-    let mut jobs = arg::consume_with_subsequents("-n", args);
-    jobs.remove(0);
-    if jobs.is_empty() {
-        return Ok(wait_next(core, &[], var_name, f_opt)?.0);
-    }
-
-    let mut ids = vec![];
-    for j in &jobs {
-        if j.starts_with("%") {
-            ids.append(&mut jobspec_to_array_poss(core, j));
-        } else {
-            for (i, job) in core.job_table.iter_mut().enumerate() {
-                if job.pids[0].to_string() == *j {
-                    ids.push(i);
-                }
-            }
-        }
-    }
-    ids.sort();
-    ids.dedup();
-    let mut ans = -1;
-
-    for _ in 0..ids.len() {
-        let tmp = match ans {
-            -1 => wait_next(core, &ids, var_name, f_opt)?,
-            _ => wait_next(core, &ids, &None, f_opt)?,
-        };
-
-        if tmp.1 && ans == -1 {
-            ans = tmp.0;
-        }
-    }
-    Ok(ans)
-}
-*/

src/core/builtins/job_commands/wait.rs

@@ -13,7 +13,7 @@ pub fn wait(core: &mut ShellCore, args: &[String]) -> i32 {
     }
 
     if args.len() <= 1 {
-        match super::wait_all(core) {
+        match wait_all(core) {
             Ok(n) => return n,
             Err(e) => {
                 e.print(core);
@@ -88,3 +88,21 @@ fn wait_n(
     }
     Ok(ans)
 }
+
+fn wait_all(core: &mut ShellCore) -> Result<i32, ExecError> {
+    let mut exit_status = 0;
+    let mut remove_list = vec![];
+    for pos in 0..core.job_table.len() {
+        let result = core.job_table[pos].nonblock_wait(&core.sigint)?;
+        exit_status = result.0;
+        if result.1 { 
+            remove_list.push(pos);
+        }
+    }
+
+    for pos in remove_list.into_iter().rev() {
+        super::remove(core, pos);
+    }
+
+    Ok(exit_status)
+}