Merge branch 'sd/202501_0' into sd/202501_1

Author: ryuichiueda

src/core.rs

@@ -2,9 +2,10 @@
 //SPDX-License-Identifier: BSD-3-Clause
 
 pub mod builtins;
+pub mod data;
 pub mod jobtable;
-pub mod parameter;
 
+use self::data::Data;
 use std::collections::HashMap;
 use std::os::fd::{FromRawFd, OwnedFd};
 use std::{io, env, path, process};
@@ -19,9 +20,8 @@ use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering::Relaxed;
 
 pub struct ShellCore {
+    pub data: Data,
     pub history: Vec<String>,
-    pub flags: String,
-    parameters: HashMap<String, String>,
     pub builtins: HashMap<String, fn(&mut ShellCore, &mut Vec<String>) -> i32>,
     pub sigint: Arc<AtomicBool>,
     pub is_subshell: bool,
@@ -50,9 +50,8 @@ fn restore_signal(sig: Signal) {
 impl ShellCore {
     pub fn new() -> ShellCore {
         let mut core = ShellCore{
+            data: Data::new(),
             history: Vec::new(),
-            flags: String::new(),
-            parameters: HashMap::new(),
             builtins: HashMap::new(),
             sigint: Arc::new(AtomicBool::new(false)),
             is_subshell: false,
@@ -66,7 +65,7 @@ impl ShellCore {
         core.set_builtins();
 
         if is_interactive() {
-            core.flags += "i";
+            core.data.flags += "i";
             let fd = fcntl::fcntl(2, fcntl::F_DUPFD_CLOEXEC(255))
                 .expect("sush(fatal): Can't allocate fd for tty FD");
             core.tty_fd = Some(unsafe{OwnedFd::from_raw_fd(fd)});
@@ -76,15 +75,15 @@ impl ShellCore {
     }
 
     fn set_initial_parameters(&mut self) {
-        self.set_param("$", &process::id().to_string());
-        self.set_param("BASHPID", &process::id().to_string());
-        self.set_param("BASH_SUBSHELL", "0");
-        self.set_param("?", "0");
-        self.set_param("HOME", &env::var("HOME").unwrap_or("/".to_string()));
+        self.data.set_param("$", &process::id().to_string());
+        self.data.set_param("BASHPID", &process::id().to_string());
+        self.data.set_param("BASH_SUBSHELL", "0");
+        self.data.set_param("?", "0");
+        self.data.set_param("HOME", &env::var("HOME").unwrap_or("/".to_string()));
     }
 
     pub fn has_flag(&self, flag: char) -> bool {
-        self.flags.find(flag) != None 
+        self.data.flags.find(flag) != None 
     }
 
     pub fn wait_process(&mut self, child: Pid) {
@@ -108,7 +107,7 @@ impl ShellCore {
         if exit_status == 130 {
             self.sigint.store(true, Relaxed);
         }
-        self.parameters.insert("?".to_string(), exit_status.to_string()); //追加
+        self.data.parameters.insert("?".to_string(), exit_status.to_string()); //追加
     } 
 
     fn set_foreground(&self) {
@@ -151,15 +150,15 @@ impl ShellCore {
 
         let func = self.builtins[&args[0]];
         let status = func(self, args);
-        self.parameters.insert("?".to_string(), status.to_string());
+        self.data.parameters.insert("?".to_string(), status.to_string());
         true
     }
 
     pub fn exit(&self) -> ! {
-        let exit_status = match self.parameters["?"].parse::<i32>() {
+        let exit_status = match self.data.parameters["?"].parse::<i32>() {
             Ok(n)  => n%256,
             Err(_) => {
-                eprintln!("sush: exit: {}: numeric argument required", self.parameters["?"]);
+                eprintln!("sush: exit: {}: numeric argument required", self.data.parameters["?"]);
                 2
             },
         };
@@ -169,10 +168,10 @@ impl ShellCore {
 
     fn set_subshell_parameters(&mut self) {
         let pid = nix::unistd::getpid();
-        self.parameters.insert("BASHPID".to_string(), pid.to_string());
-        match self.parameters["BASH_SUBSHELL"].parse::<usize>() {
-            Ok(num) => self.parameters.insert("BASH_SUBSHELL".to_string(), (num+1).to_string()),
-            Err(_) =>  self.parameters.insert("BASH_SUBSHELL".to_string(), "0".to_string()),
+        self.data.parameters.insert("BASHPID".to_string(), pid.to_string());
+        match self.data.parameters["BASH_SUBSHELL"].parse::<usize>() {
+            Ok(num) => self.data.parameters.insert("BASH_SUBSHELL".to_string(), (num+1).to_string()),
+            Err(_) =>  self.data.parameters.insert("BASH_SUBSHELL".to_string(), "0".to_string()),
         };
     }
 

src/core/builtins.rs

@@ -22,7 +22,7 @@ impl ShellCore {
 pub fn exit(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     eprintln!("exit");
     if args.len() > 1 {
-        core.parameters.insert("?".to_string(), args[1].clone());
+        core.data.parameters.insert("?".to_string(), args[1].clone());
     }
     core.exit()
 }

src/core/builtins/cd.rs

@@ -31,7 +31,7 @@ fn cd_1arg(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
 }
 
 fn cd_oldpwd(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
-    if let Some(old) = core.parameters.get("OLDPWD") {
+    if let Some(old) = core.data.parameters.get("OLDPWD") {
         println!("{}", &old);
         args[1] = old.to_string();
     }else {
@@ -45,14 +45,14 @@ fn cd_oldpwd(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
 
 fn set_oldpwd(core: &mut ShellCore) {
     if let Some(old) = core.get_current_directory() {
-        core.parameters.insert("OLDPWD".to_string(), old.display().to_string());
+        core.data.parameters.insert("OLDPWD".to_string(), old.display().to_string());
     };
 }
 
 fn change_directory(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     let path = utils::make_canonical_path(core, &args[1]);
     if core.set_current_directory(&path).is_ok() {
-        core.parameters.insert("PWD".to_string(), path.display().to_string());
+        core.data.parameters.insert("PWD".to_string(), path.display().to_string());
         0
     }else{
         eprintln!("sush: cd: {:?}: No such file or directory", &path);

src/core/builtins/utils.rs

@@ -14,7 +14,7 @@ pub fn make_absolute_path(core: &mut ShellCore, path_str: &str) -> PathBuf {
     }
 
     if path.starts_with("~") { // tilde -> $HOME
-        if let Some(home_dir) = core.parameters.get("HOME") {
+        if let Some(home_dir) = core.data.parameters.get("HOME") {
             absolute.push(PathBuf::from(home_dir));
             if path_str.len() > 1 && path_str.starts_with("~/") {
                 absolute.push(PathBuf::from(&path_str[2..]));

src/core/parameter.rs renamed to src/core/data.rs

@@ -1,14 +1,27 @@
 //SPDXFileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com
 //SPDXLicense-Identifier: BSD-3-Clause
 
-use crate::ShellCore;
+use std::collections::HashMap;
 
-impl ShellCore {
-    pub fn get_param_ref(&self, key: &str) -> &str {
+#[derive(Debug)]
+pub struct Data {
+    pub flags: String,
+    pub parameters: HashMap<String, String>,
+}
+
+impl Data {
+    pub fn new() -> Data {
+        Data {
+            flags: String::new(),
+            parameters: HashMap::new(),
+        }
+    }
+
+    pub fn get_param(&self, key: &str) -> String {
         match self.parameters.get(key) {
             Some(val) => val,
             None      => "",
-        }
+        }.to_string()
     }
 
     pub fn set_param(&mut self, key: &str, val: &str) {

src/elements/command.rs

@@ -57,7 +57,7 @@ pub trait Command {
         if self.get_redirects().iter_mut().all(|r| r.connect(true, core)){
             self.run(core, false);
         }else{
-            core.set_param("?", "1");
+            core.data.set_param("?", "1");
         }
         self.get_redirects().iter_mut().rev().for_each(|r| r.restore());
     }

src/elements/command/if.rs

@@ -19,7 +19,7 @@ impl Command for IfCommand {
     fn run(&mut self, core: &mut ShellCore, _: bool) {
         for i in 0..self.if_elif_scripts.len() {
             self.if_elif_scripts[i].exec(core);
-            if core.get_param_ref("?") == "0" {
+            if core.data.get_param("?") == "0" {
                 self.then_scripts[i].exec(core);
                 return;
             }

src/elements/command/while.rs

@@ -21,7 +21,7 @@ impl Command for WhileCommand {
                 .expect("SUSH INTERNAL ERROR (no script)")
                 .exec(core);
 
-            if core.get_param_ref("?") != "0" {
+            if core.data.get_param("?") != "0" {
                 break;
             }
 

src/elements/job.rs

@@ -36,7 +36,7 @@ impl Job {
                 let pids = pipeline.exec(core, pgid);
                 core.wait_pipeline(pids);
             }
-            do_next = (core.get_param_ref("?") == "0") == (end == "&&");
+            do_next = (core.data.get_param("?") == "0") == (end == "&&");
         }
     }
 

src/elements/pipeline.rs

@@ -18,7 +18,7 @@ pub struct Pipeline {
 impl Pipeline {
     pub fn exec(&mut self, core: &mut ShellCore, pgid: Pid) -> Vec<Option<Pid>> {
         if core.sigint.load(Relaxed) { //以下4行追加
-            core.set_param("?", "130");
+            core.data.set_param("?", "130");
             return vec![];
         }