fix stdout error

Author: zhangzijie-pro

command/src/commands/arg.rs

@@ -5,7 +5,7 @@ use crate::state_code::{missing_pattern, not_found};
 use super::code::*;
 use super::command::*;
 
-#[derive(Clone)]
+#[derive(Clone,Debug)]
 pub struct Commands{
     pub command: String,
     pub option: String,
@@ -20,6 +20,19 @@ impl Commands {
         let mut option = String::new();
         let mut arg = Vec::new();
 
+        // get > len
+        let parts: Vec<&str> = commands.iter().map(|s| s.as_str()).collect();
+        let redirect_index = parts.iter().position(|&x| x == ">");
+        if let Some(redirect_index) = redirect_index {
+            if redirect_index > 1 {
+                arg = parts.iter().map(|&s| s.to_string()).collect();
+                return Commands {
+                    command: String::new(),
+                    option: ">".to_string(),
+                    arg,
+                };
+            }
+        }
         match commands.as_slice() {
             [cmd] => {
                 command = cmd.clone();
@@ -40,9 +53,9 @@ impl Commands {
                     arg.push(opt.clone());
                 }
                 arg.extend_from_slice(args);
-            }
+            },
             _ => {
-                if commands.iter().any(|x| x == "|" || x == "&" || x == "&&") {
+                if commands.iter().any(|x| x == "|" || x == "&" || x == "&&" || x==">") {
                     arg = commands;
                 }
             }
@@ -217,4 +230,19 @@ pub fn split(commands: Commands) -> (String,String,Vec<String>){
     let option = commands.option.clone();
     let arg = commands.arg.clone();
     (command,option,arg)
+}
+
+// ["cat", "README.md", ">", "a.txt"]
+
+//command: ["cat", "README.md"]
+//file: a.txt
+pub fn stdout_other(arg: &Vec<String>) -> (String,Commands){
+    let mut s = arg.split(|s| s==">");
+    let output = s.next().unwrap().to_vec();
+    let file = &s.next().unwrap()[0];
+
+    
+    let command = turn_command(output);
+
+    (file.to_string(),command)
 }

command/src/commands/command.rs

@@ -370,7 +370,7 @@ use tar::Archive;
 use flate2::read::GzDecoder;
 use flate2::Compression;
 use flate2::write::GzEncoder;
-use super::arg::{execute_command, execute_other_command, split, Commands};
+use super::arg::{execute_command, execute_other_command, split, stdout_other, Commands};
 
 
 pub fn zxvf(file: &str, to: &str) -> Result<(usize,String),std::io::Error>{
@@ -398,11 +398,23 @@ pub fn xvf(to: &str) -> Result<(usize,String),std::io::Error>{
 
 
 // 重定向输出   > 
+#[allow(unused_variables)]
+#[allow(unused_assignments)]
 pub fn stdout_file(commands: Commands,session_context: &mut SessionContext) -> Result<(usize,String), std::io::Error>{
-    let command = commands.command.clone();
-    let arg = commands.arg.clone();
-    let result = execute_command(&command, "", &arg, session_context)?.1;
-    let mut file = File::create(arg[arg.len()-1].clone())?;
+    let mut command = commands.command.clone();
+    let mut option = String::new();
+    let mut arg = commands.arg.clone();
+    let mut file = String::new();
+    if command.is_empty(){
+        let (f,new_command) = stdout_other(&arg);
+        file = f;
+        let (command_v,option_v,arg_v) = split(new_command);
+        (command,option,arg) = (command_v,option_v,arg_v);
+    }else{
+        file = arg[arg.len()-1].clone();
+    }
+    let result = execute_command(&command, &option, &arg, session_context)?.1;
+    let mut file = File::create(file)?;
     file.write(result.as_bytes())?;
     Ok((STATUE_CODE,"write over!".to_string()))
 }