From c076d20f1d34238612202c1d65ed834117afc48b Mon Sep 17 00:00:00 2001
From: liutong <liutonga@uniontech.com>
Date: Tue, 13 Jun 2023 23:03:49 +0800
Subject: [PATCH]  refactor: modify execute_cmd function,part 1

---
 bash-5.1/Cargo.toml    |  4 +++-
 bash-5.1/execute_cmd.c |  3 ++-
 bash-5.1/rsbuiltins.h  |  2 ++
 bash-5.1/src/lib.rs    | 39 ++++++++++++++++++++++++++++++++++++++-
 record.txt             |  1 +
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/bash-5.1/Cargo.toml b/bash-5.1/Cargo.toml
index 48dca7e2..6e02f0ac 100644
--- a/bash-5.1/Cargo.toml
+++ b/bash-5.1/Cargo.toml
@@ -8,9 +8,11 @@ crate-type = ["cdylib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [workspace]
-members = ["builtins/command1", "builtins/command2"]
+members = ["builtins_rust/read", "builtins/command1", "builtins/command2", "builtins_rust/common"]
 
 [dependencies]
+libc = "0.2"
 command1 = {path = "./builtins/command1"}
 command2 = {path = "./builtins/command2"}
 read = {path = "./builtins_rust/read"}
+common = {path = "./builtins_rust/common"}
diff --git a/bash-5.1/execute_cmd.c b/bash-5.1/execute_cmd.c
index ecd509c3..9d66af0b 100644
--- a/bash-5.1/execute_cmd.c
+++ b/bash-5.1/execute_cmd.c
@@ -4737,7 +4737,7 @@ execute_builtin (builtin, words, flags, subshell)
   error_trap = 0;
   should_keep = 0;
 
-  r_execute_cmd();
+  //r_execute_cmd();
   /* The eval builtin calls parse_and_execute, which does not know about
      the setting of flags, and always calls the execution functions with
      flags that will exit the shell on an error if -e is set.  If the
@@ -4841,6 +4841,7 @@ execute_builtin (builtin, words, flags, subshell)
   executing_builtin++;
   executing_command_builtin |= builtin == command_builtin;
   result = ((*builtin) (words->next));
+  // r_execute_cmd2(words->next);
 
   /* This shouldn't happen, but in case `return' comes back instead of
      longjmp'ing, we need to unwind. */
diff --git a/bash-5.1/rsbuiltins.h b/bash-5.1/rsbuiltins.h
index f3b7f9be..f6f3be36 100644
--- a/bash-5.1/rsbuiltins.h
+++ b/bash-5.1/rsbuiltins.h
@@ -1,2 +1,4 @@
 #include <stdio.h>
+#include "command.h"
 int r_execute_cmd();
+int r_execute_cmd2(WORD_LIST *l);
diff --git a/bash-5.1/src/lib.rs b/bash-5.1/src/lib.rs
index 874f7e60..39f431c5 100644
--- a/bash-5.1/src/lib.rs
+++ b/bash-5.1/src/lib.rs
@@ -1,5 +1,42 @@
+use libc::{c_char, c_int, c_long};
+use std::ffi::CStr;
+use std::str;
+
+#[repr(C)]
+pub struct WORD_DESC {
+    pub word : *mut c_char,
+    pub flags : c_int
+}
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct  WORD_LIST {
+    next : *mut WORD_LIST,
+    word : *mut WORD_DESC
+}
+
+
+//#[link(name = "")]
+//extern {
+ //   pub fn printf(
 #[no_mangle]
 pub extern "C" fn r_execute_cmd() {
-    println!("hello");
+    //println!("hello");
+    //common::builtin_error("test error")
 }
 
+#[no_mangle]
+pub extern "C" fn r_execute_cmd2(l : *mut WORD_LIST) -> i32 {
+    unsafe {
+        let mut it :  *mut WORD_LIST = l;
+        while std::ptr::null()  !=  it {
+            //let mut a = (&((* ((*l).word)).word) );
+            let mut a :*mut c_char =( *(*it).word).word;
+            let c_str: &CStr = CStr::from_ptr(a);
+            let str_slice: &str = c_str.to_str().unwrap();
+            println! ("word is {:?}", str_slice);
+            it = (*it).next;
+        }
+    }
+    0
+}
diff --git a/record.txt b/record.txt
index 535d2b01..07193989 100644
--- a/record.txt
+++ b/record.txt
@@ -6,3 +6,4 @@
 6
 7
 8
+9
-- 
Gitee