Refactor

Author: ryuichiueda

src/elements/command/simple.rs

@@ -1,7 +1,7 @@
 //SPDX-FileCopyrightText: 2022 Ryuichi Ueda ryuichiueda@gmail.com
 //SPDX-License-Identifier: BSD-3-Clause
 
-use crate::{ShellCore, Feeder};
+use crate::{ShellCore, Feeder, proc_ctrl};
 use crate::error::exec::ExecError;
 use crate::error::parse::ParseError;
 use super::{Command, Pipe, Redirect};
@@ -10,12 +10,7 @@ use crate::elements::substitution::Substitution;
 use crate::elements::word::Word;
 use crate::utils;
 use crate::utils::exit;
-use nix::unistd;
-use std::ffi::CString;
-use std::process;
-
 use nix::unistd::Pid;
-use nix::errno::Errno;
 
 #[derive(Debug, Default, Clone)]
 pub struct SimpleCommand {
@@ -65,7 +60,7 @@ impl Command for SimpleCommand {
         if ! core.run_function(&mut self.args) 
         && ! core.run_builtin(&mut self.args) {
             self.set_environment_variables(core)?;
-            Self::exec_external_command(&mut self.args)
+            proc_ctrl::exec_command(&mut self.args)
         }
 
         core.db.pop_local();
@@ -84,25 +79,6 @@ impl Command for SimpleCommand {
 }
 
 impl SimpleCommand {
-    fn exec_external_command(args: &mut [String]) -> ! {
-        let cargs = Self::to_cargs(args);
-        match unistd::execvp(&cargs[0], &cargs) {
-            Err(Errno::EACCES) => {
-                println!("sush: {}: Permission denied", &args[0]);
-                process::exit(126)
-            },
-            Err(Errno::ENOENT) => {
-                println!("{}: command not found", &args[0]);
-                process::exit(127)
-            },
-            Err(err) => {
-                println!("Failed to execute. {:?}", err);
-                process::exit(127)
-            }
-            _ => panic!("SUSH INTERNAL ERROR (never come here)")
-        }
-    }
-
     fn set_local_params(&mut self,core: &mut ShellCore) -> Result<(), ExecError> {
         let layer = Some(core.db.get_layer_num() - 1);
         for s in self.substitutions.iter_mut() {
@@ -119,12 +95,6 @@ impl SimpleCommand {
         Ok(())
     } 
 
-    fn to_cargs(args: &mut [String]) -> Vec<CString> {
-        args.iter()
-            .map(|a| CString::new(a.to_string()).unwrap())
-            .collect()
-    }
-
     pub fn eat_substitution(&mut self, feeder: &mut Feeder, core: &mut ShellCore)
     -> Result<bool, ParseError> {
         if let Some(s) = Substitution::parse(feeder, core)? {

src/main.rs

@@ -5,6 +5,7 @@ mod core;
 mod error;
 mod feeder;
 mod elements;
+mod proc_ctrl;
 mod signal;
 mod utils;
 

src/proc_ctrl.rs

@@ -0,0 +1,28 @@
+//SPDX-FileCopyrightText: 2024 Ryuichi Ueda ryuichiueda@gmail.com
+//SPDX-License-Identifier: BSD-3-Clause
+
+use crate::utils::c_string;
+use nix::errno::Errno;
+use nix::unistd;
+use std::process;
+
+pub fn exec_command(args: &[String]) -> ! {
+    let cargs = c_string::to_cargs(args);
+    let result = unistd::execvp(&cargs[0], &cargs);
+
+    match result {
+        Err(Errno::EACCES) => {
+            println!("sush: {}: Permission denied", &args[0]);
+            process::exit(126)
+        },
+        Err(Errno::ENOENT) => {
+            println!("{}: command not found", &args[0]);
+            process::exit(127)
+        },
+        Err(err) => {
+            println!("Failed to execute. {:?}", err);
+            process::exit(127)
+        }
+        _ => panic!("SUSH INTERNAL ERROR (never come here)")
+    }
+}

src/utils.rs

@@ -1,6 +1,7 @@
 //SPDX-FileCopyrightText: 2024 Ryuichi Ueda <ryuichiueda@gmail.com>
 //SPDX-License-Identifier: BSD-3-Clause
 
+pub mod c_string;
 pub mod directory;
 pub mod exit;
 pub mod file_check;

src/utils/c_string.rs

@@ -0,0 +1,33 @@
+//SPDX-FileCopyrightText: 2025 Ryuichi Ueda <ryuichiueda@gmail.com>
+//SPDX-License-Identifier: BSD-3-Clause
+
+use std::ffi::CString;
+
+pub fn to_carg(arg: &str) -> CString {
+    let mut tmp = String::new();
+    let mut unicode8num = 0;
+
+    for c in arg.chars() {
+        if c as u32 >= 0xE080 && c as u32 <= 0xE0FF {
+            let num: u8 = (c as u32 - 0xE000) as u8;
+            let ch = unsafe { String::from_utf8_unchecked(vec![num]) };
+            tmp.push_str(&ch);
+        } else if c as u32 >= 0xE200 && c as u32 <= 0xE4FF {
+            unicode8num <<= 8;
+            unicode8num += c as u32 & 0xFF;
+        } else if c as u32 >= 0xE100 && c as u32 <= 0xE1FF {
+            unicode8num <<= 8;
+            unicode8num += c as u32 & 0xFF;
+            let ch = unsafe { char::from_u32_unchecked(unicode8num) }.to_string();
+            unicode8num = 0; //　^ An error occurs on debug mode.
+            tmp.push_str(&ch);
+        } else {
+            tmp.push(c);
+        }
+    }
+    CString::new(tmp.to_string()).unwrap()
+}
+
+pub fn to_cargs(args: &[String]) -> Vec<CString> {
+    args.iter().map(|s| to_carg(s)).collect()
+}