Fix conflict

Author: ryuichiueda

.github/workflows/macos.yml

@@ -20,6 +20,6 @@ jobs:
     - name: Bash tests
       run: |
         dir=$PWD
-        git clone https://github.com/shellgei/rusty_bash_test -b v1.1.4 --depth 1
+        git clone https://github.com/shellgei/rusty_bash_test -b v1.1.5 --depth 1
         cd rusty_bash_test
         ./test.bash $dir

.github/workflows/ubuntu.yml

@@ -20,6 +20,6 @@ jobs:
     - name: Bash tests
       run: |
         dir=$PWD
-        git clone https://github.com/shellgei/rusty_bash_test -b v1.1.4 --depth 1
+        git clone https://github.com/shellgei/rusty_bash_test -b v1.1.5 --depth 1
         cd rusty_bash_test
         ./test.bash $dir

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sush"
-version = "1.1.4"
+version = "1.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,6 +12,7 @@ unicode-width = "0.1.11"
 signal-hook = "0.3.17"
 rev_lines = "0.3.0"
 faccess = "0.2.4"
+io-streams = "0.16.3"
 regex = "1.11.1"
 rand = "0.9"
 rand_chacha = { version = "0.9.0", features = [ "os_rng" ]}

src/core.rs

@@ -10,10 +10,9 @@ pub mod jobtable;
 pub mod options;
 
 use crate::{error, proc_ctrl, signal};
-use crate::error::exec::ExecError;
 use self::database::DataBase;
 use self::options::Options;
-use self::completion::CompletionInfo;
+use self::completion::{Completion, CompletionEntry};
 use std::collections::HashMap;
 use std::os::fd::{FromRawFd, OwnedFd};
 use std::{io, env, path};
@@ -51,7 +50,6 @@ pub struct ShellCore {
     pub builtins: HashMap<String, fn(&mut ShellCore, &mut Vec<String>) -> i32>,
     pub sigint: Arc<AtomicBool>,
     pub trapped: Vec<(Arc<AtomicBool>, String)>,
-    pub read_stdin: bool,
     pub is_subshell: bool,
     pub source_function_level: i32,
     pub source_files: Vec<String>,
@@ -65,10 +63,7 @@ pub struct ShellCore {
     pub job_table: Vec<JobEntry>,
     pub job_table_priority: Vec<usize>,
     current_dir: Option<path::PathBuf>, // the_current_working_directory
-    pub completion_info: HashMap<String, CompletionInfo>,
-    pub current_completion_info: CompletionInfo,
-    pub completion_functions: HashMap<String, String>,
-    pub default_completion_functions: String,
+    pub completion: Completion,
     pub measured_time: MeasuredTime,
     pub options: Options,
     pub shopts: Options,
@@ -83,7 +78,7 @@ impl ShellCore {
         let mut core = ShellCore{
             db: DataBase::new(),
             sigint: Arc::new(AtomicBool::new(false)),
-            read_stdin: true,
+            //read_stdin: true,
             options: Options::new_as_basic_opts(),
             shopts: Options::new_as_shopts(),
             script_name: "-".to_string(),
@@ -99,8 +94,8 @@ impl ShellCore {
         let _ = core.db.set_param("PS4", "+ ", None);
 
         if unistd::isatty(0) == Ok(true) {
-            core.db.flags += "im";
-            core.read_stdin = false;
+            core.db.flags += "imH";
+            //core.read_stdin = false;
             let _ = core.db.set_param("PS1", "🍣 ", None);
             let _ = core.db.set_param("PS2", "> ", None);
             let fd = fcntl::fcntl(0, fcntl::F_DUPFD_CLOEXEC(255))
@@ -148,20 +143,20 @@ impl ShellCore {
         self.db.exit_status = if self.db.exit_status == 0 { 1 } else { 0 };
     }
 
-    pub fn run_builtin(&mut self, args: &mut Vec<String>, special_args: &mut Vec<String>)
-                                -> Result<bool, ExecError> {
+    pub fn run_builtin(&mut self, args: &mut Vec<String>, special_args: &mut Vec<String>) -> bool {
         if args.is_empty() {
-            return Err(ExecError::Bug("ShellCore::run_builtin".to_string()));
+            eprintln!("ShellCore::run_builtin");
+            return false;
         }
 
         if self.builtins.contains_key(&args[0]) {
             let func = self.builtins[&args[0]];
             args.append(special_args);
             self.db.exit_status = func(self, args);
-            return Ok(true);
+            return true;
         }
 
-        Ok(false)
+        false
     }
 
     fn set_subshell_parameters(&mut self) -> Result<(), String> {
@@ -233,12 +228,15 @@ impl ShellCore {
     }
 
     fn replace_alias_core(&self, word: &mut String) -> bool {
-        if ! self.db.flags.contains('i') {
-            return false;
+        if ! self.shopts.query("expand_aliases") {
+            if ! self.db.flags.contains('i') {
+                return false;
+            }
         }
 
         let mut ans = false;
         let mut prev_head = "".to_string();
+        let history = vec![word.clone()];
 
         loop {
             let head = match word.replace("\n", " ").split(' ').nth(0) {
@@ -252,6 +250,9 @@ impl ShellCore {
 
             if let Some(value) = self.aliases.get(&head) {
                 *word = word.replacen(&head, value, 1);
+                if history.contains(word) {
+                    return false;
+                }
                 ans = true;
             }
             prev_head = head;

src/core/builtins/compgen.rs

@@ -76,6 +76,7 @@ fn replace_args_compgen(args: &mut Vec<String>) -> bool {
         "file" => "-f",
         "user" => "-u",
         "setopt" => "-o",
+        "function" => "-A function",
         "hostname" => "-A hostname",
         "shopt" => "-A shopt",
         "stopped" => "-A stopped",
@@ -136,6 +137,7 @@ pub fn compgen(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
         "-j" => compgen_j(core, &mut args),
         "-u" => compgen_u(core, &mut args),
         "-v" => compgen_v(core, &mut args),
+        "-A function" => compgen_function(core, &mut args),
         "-A hostname" => compgen_hostname(core, &mut args),
         "-A shopt" => compgen_shopt(core, &mut args),
         "-A stopped" => compgen_stopped(core, &mut args),
@@ -202,7 +204,7 @@ fn drop_unmatch(args: &mut Vec<String>, pos: usize, list: &mut Vec<String>) {
 pub fn compgen_a(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     let mut commands = vec![];
 
-    let mut aliases: Vec<String> = core.aliases.clone().into_keys().collect();
+    let mut aliases: Vec<String> = core.aliases.keys().map(|k| k.clone()).collect();
     commands.append(&mut aliases);
 
     let head = get_head(args, 2);
@@ -214,7 +216,7 @@ pub fn compgen_a(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
 
 pub fn compgen_b(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     let mut commands = vec![];
-    let mut builtins: Vec<String> = core.builtins.clone().into_keys().collect();
+    let mut builtins: Vec<String> = core.builtins.keys().map(|k| k.clone()).collect();
     commands.append(&mut builtins);
 
     let head = get_head(args, 2);
@@ -231,11 +233,11 @@ pub fn compgen_c(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     }
     commands.retain(|p| Path::new(p).executable() || file_check::is_dir(p));
 
-    let mut aliases: Vec<String> = core.aliases.clone().into_keys().collect();
+    let mut aliases: Vec<String> = core.aliases.keys().map(|k| k.clone()).collect();
     commands.append(&mut aliases);
-    let mut builtins: Vec<String> = core.builtins.clone().into_keys().collect();
+    let mut builtins: Vec<String> = core.builtins.keys().map(|k| k.clone()).collect();
     commands.append(&mut builtins);
-    let mut functions: Vec<String> = core.db.functions.clone().into_keys().collect();
+    let mut functions: Vec<String> = core.db.functions.keys().map(|k| k.clone()).collect();
     commands.append(&mut functions);
 
     let head = get_head(args, 2);
@@ -281,9 +283,9 @@ pub fn compgen_h(core: &mut ShellCore, _: &mut Vec<String>) -> Vec<String> {
 pub fn compgen_v(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
     let mut commands = vec![];
 
-    let mut aliases: Vec<String> = core.aliases.clone().into_keys().collect();
+    let mut aliases: Vec<String> = core.aliases.keys().map(|k| k.clone()).collect();
     commands.append(&mut aliases);
-    let mut functions: Vec<String> = core.db.functions.clone().into_keys().collect();
+    let mut functions: Vec<String> = core.db.functions.keys().map(|k| k.clone()).collect();
     commands.append(&mut functions);
     let mut vars: Vec<String> = core.db.get_keys();
     commands.append(&mut vars);
@@ -367,6 +369,12 @@ pub fn compgen_shopt(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String
     ans
 }
 
+pub fn compgen_function(core: &mut ShellCore, args: &mut Vec<String>) -> Vec<String> {
+    let mut ans = core.db.functions.keys().map(|k| k.clone()).collect();
+    drop_unmatch(args, 2, &mut ans);
+    ans
+}
+
 pub fn compgen_hostname(_: &mut ShellCore, _: &mut Vec<String>) -> Vec<String> {
     //TODO: Implement!
     vec![]

src/core/builtins/complete.rs

@@ -2,7 +2,7 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 use crate::{builtins, ShellCore};
-use crate::core::{CompletionInfo, HashMap};
+use crate::core::{CompletionEntry, HashMap};
 use crate::utils::arg;
 
 fn action_to_reduce_symbol(arg: &str) -> String {
@@ -42,11 +42,11 @@ fn opt_to_action(arg: &str) -> String {
 }
 
 fn print_complete(core: &mut ShellCore) -> i32 {
-    if core.default_completion_functions != "" {
-        println!("complete -F {} -D", &core.default_completion_functions);
+    if core.completion.default_function != "" {
+        println!("complete -F {} -D", &core.completion.default_function);
     }
 
-    for (name, info) in &core.completion_info {
+    for (name, info) in &core.completion.entries {
         if info.function != "" {
             print!("complete -F {} ", &info.function);
         }else if info.action != "" {
@@ -80,16 +80,16 @@ fn complete_f(core: &mut ShellCore, args: &mut Vec<String>, o_options: &Vec<Stri
     }
 
     if d_option {
-        core.default_completion_functions = args[1].clone();
+        core.completion.default_function = args[1].clone();
         return 0;
     }else {
         let func = args[1].clone();
         for command in &args[2..] {
-            if ! core.completion_info.contains_key(command) {
-                core.completion_info.insert(command.clone(), CompletionInfo::default());
+            if ! core.completion.entries.contains_key(command) {
+                core.completion.entries.insert(command.clone(), CompletionEntry::default());
             }
 
-            let info = &mut core.completion_info.get_mut(command).unwrap();
+            let info = &mut core.completion.entries.get_mut(command).unwrap();
             info.function = func.clone();
             info.o_options = o_options.clone();
         }
@@ -100,7 +100,7 @@ fn complete_f(core: &mut ShellCore, args: &mut Vec<String>, o_options: &Vec<Stri
 
 fn complete_r(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     for command in &mut args[1..] {
-        core.completion_info.remove(command);
+        core.completion.entries.remove(command);
     }
 
     0
@@ -135,11 +135,11 @@ pub fn complete(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     let action = opt_to_action(&args[1]);
     if action != "" {
         for command in &args[2..] {
-            if ! core.completion_info.contains_key(command) {
-                core.completion_info.insert(command.clone(), CompletionInfo::default());
+            if ! core.completion.entries.contains_key(command) {
+                core.completion.entries.insert(command.clone(), CompletionEntry::default());
             }
 
-            let info = &mut core.completion_info.get_mut(command).unwrap();
+            let info = &mut core.completion.entries.get_mut(command).unwrap();
             info.action = action.clone();
             info.options = options.clone();
         }
@@ -148,11 +148,11 @@ pub fn complete(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
 
     if args.len() > 3 && args[1] == "-A" {
         for command in &args[3..] {
-            if ! core.completion_info.contains_key(command) {
-                core.completion_info.insert(command.clone(), CompletionInfo::default());
+            if ! core.completion.entries.contains_key(command) {
+                core.completion.entries.insert(command.clone(), CompletionEntry::default());
             }
 
-            let info = &mut core.completion_info.get_mut(command).unwrap();
+            let info = &mut core.completion.entries.get_mut(command).unwrap();
             info.action = args[2].clone();
             info.options = options.clone();
         }

src/core/builtins/compopt.rs

@@ -2,10 +2,10 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 use crate::ShellCore;
-use crate::core::CompletionInfo;
+use crate::core::CompletionEntry;
 use crate::utils::arg;
 
-fn compopt_set(info: &mut CompletionInfo, plus: &Vec<String>, minus: &Vec<String>) -> i32 {
+fn compopt_set(info: &mut CompletionEntry, plus: &Vec<String>, minus: &Vec<String>) -> i32 {
     for opt in minus { //add
         if ! info.o_options.contains(opt) {
             info.o_options.push(opt.to_string());
@@ -26,8 +26,8 @@ fn compopt_print(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     let optlist: Vec<String> = optlist.iter().map(|s| s.to_string()).collect();
 
     let com = args[1].clone();
-    if core.completion_info.contains_key(&com) {
-        let info = &core.completion_info.get_mut(&com).unwrap();
+    if core.completion.entries.contains_key(&com) {
+        let info = &core.completion.entries.get_mut(&com).unwrap();
 
         print!("compopt ");
         for opt in &optlist {
@@ -47,7 +47,7 @@ fn compopt_print(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
 
 pub fn compopt(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     if args.len() < 2 {
-        dbg!("{:?}", &core.completion_info);
+        dbg!("{:?}", &core.completion.entries);
         return 1;
     }
 
@@ -104,9 +104,9 @@ pub fn compopt(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     }
 
     let info = if args.len() == 1 {
-        &mut core.current_completion_info
+        &mut core.completion.current
     }else if args.len() == 2 {
-        match core.completion_info.get_mut(&args[1]) {
+        match core.completion.entries.get_mut(&args[1]) {
             Some(i) => i,
             None => return 1,
         }

src/core/builtins/option.rs

@@ -25,7 +25,7 @@ pub fn set_options(core: &mut ShellCore, args: &[String]) -> Result<(), ExecErro
         let pm = a.chars().nth(0).unwrap();
         let ch = a.chars().nth(1).unwrap();
 
-        if (pm != '-' && pm != '+') || "xveB".find(ch).is_none() {
+        if (pm != '-' && pm != '+') || "xveBH".find(ch).is_none() {
             return Err(ExecError::InvalidOption(a.to_string()));
         }
 
@@ -188,7 +188,7 @@ pub fn shopt(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
 
     let res = match args[1].as_str() { //TODO: args[3..] must to be set
         "-s" => {
-            if ["extglob", "progcomp", "nullglob", "dotglob", "globstar", "globskipdots", "nocasematch"].iter().any(|&e| e == args[2]) {
+            if core.shopts.implemented.contains(&args[2]) {
                 core.shopts.set(&args[2], true)
             }else{
                 let msg = format!("shopt: {}: not supported yet", &args[2]);