add..

Author: zhangzijie-pro

command/bin/main.rs

@@ -24,18 +24,4 @@ async fn main() {
 
         // init shell
         init_shell(&mut session_context)
-}
-
-// C test
-/*
-#[link(name="hello")]
-extern "C"{
-        fn hello();
-}
-
-fn main(){     
-        unsafe{
-                hello()
-        }
-}
-*/
+}

command/src/c_build/README.md

@@ -8,6 +8,8 @@
 
 完成后，可在command.rs中声明方法，并在arg.rs中进行配置
 详见:[rust添加方法](../commands/README.md)
+[代码示例<command.rs>](../commands/command.rs)
+[代码示例<arg.rs>](../commands/arg.rs)
 
 ```rust
 

command/src/c_build/build_c.sh

@@ -79,7 +79,7 @@ pub fn command_match(commands: Commands,session_context: &mut SessionContext) ->
     }
 }
 
-
+// root function
 #[allow(unused_assignments)]
 pub fn execute_command(command: &str, option: &str, arg: &Vec<String>, session_context: &mut SessionContext) -> Result<(usize,String), std::io::Error> {
     match command {
@@ -150,13 +150,18 @@ pub fn execute_command(command: &str, option: &str, arg: &Vec<String>, session_c
 }
 
 
-// match has arg's function
+// normal function
 pub fn execute_other_command(command: &str, option: &str, arg: &[String]) -> Result<(usize,String), std::io::Error> {
     match command {
         "help" => Ok((0,help())),
         "pwd" => pwd(),
         "time" => get_time(),
         "history" => history(),
+        // test C define here
+        "hello_c" => {
+            test_c();
+            Ok((0,"test C ok...!".to_string()))
+        },
         "ls" | "l" => ls(),
         "grep" => match arg.is_empty(){
             true=>Ok(missing_pattern()),

command/src/commands/arg.rs

@@ -612,6 +612,18 @@ pub fn turn_command(v: Vec<String>) -> Commands{
     ouput
 }
 
+
+// C test
+#[link(name="hello")]
+extern "C"{
+        fn hello();
+}
+
+pub fn test_c(){
+    unsafe{
+        hello()
+    }
+}
 /*
     fn vim(){
         

command/src/commands/command.rs

@@ -27,7 +27,7 @@ impl Ord for CommandPriority {
 // Set command priority
 pub fn get_priority(command: &str) -> CommandPriority{
     match command{
-        "pwd"|"ls"|"mkdir"|"touch"|"whoami"|"exit" => CommandPriority::Low,
+        "pwd"|"ls"|"mkdir"|"touch"|"whoami"|"exit"|"echo"|"print" => CommandPriority::Low,
         "cd"|"rm"|"cat"|"python"|"html"|"web"|"rn"|"mv"|"tar"|"grep"|"pd"|"root"|"apt"|"history" => CommandPriority::Medium,
         "sleep"|"kill"|"ps"=> CommandPriority::High,
         _ => CommandPriority::Unknow

command/src/priority/mod.rs

@@ -124,17 +124,18 @@ pub fn init_shell(session_context: &mut SessionContext){
                         }
                     }
                 } else {
-                    let args: Vec<String> = line.split_whitespace().map(|s| s.to_string()).collect();
+                    let args: Box<Vec<String>> = Box::new(line.split_whitespace().map(|s| s.to_string()).collect());
                     if args.contains(&"&&".to_string()) {
-                        and(args, session_context)
+                        and(*args, session_context)
                     } else if args.contains(&"|".to_string()) {
-                        let s = pipe(args).unwrap();
+                        let s = pipe(*args).unwrap();
                         println!("{}", s.1);
                     } else if args.contains(&"&".to_string()) {
-                        priority_run(args, session_context)
+                        priority_run(*args, session_context)
                     } else {
-                        run(args, session_context);
+                        run(*args, session_context);
                     }
+                    
                 }
             }
             Err(ReadlineError::Interrupted) => {