What is happening?

hw7/task2/src/lib.rs

@@ -141,50 +141,45 @@ impl<R: BufRead, W: Write> Shell<R, W> {
 
                 let mut commands = cmd.split('|');
                 let commands_vec: Vec<&str> = commands.collect();
+                
+                let needs_pipe = commands_vec.len() == 2;
 
                 if let Ok((reader, writer)) = pipe() {
-                    /*
-                    let pid = fork();
-                    match pid {
+
+                    let fi = fork();
+                    match fi {
                         Ok(Parent { .. }) => {
-                                //wait();
+                            wait();
                         }
                         Ok(Child) => {
-
+                            if let Some(first) = commands_vec.get(0) {
+                                if needs_pipe {
+                                    close(reader).unwrap();
+                                    dup2(writer, 1).unwrap();
+                                }
+                                self.execute(first);
+                            }
                         }
-
                         Err(_) => println!("Fatal error: Fork failed"),
                     }
-                    */
 
-                    let sub_pid = fork();
-                    match sub_pid {
+
+                    let sec = fork();
+                    match sec {
                         Ok(Parent { .. }) => {
-                            if let Some(out) = commands_vec.get(1) {
-                                wait();
-                                close(writer).unwrap();
-                                dup2(reader, 0).unwrap();
-                                self.execute(out)
-                            } else {
-                                wait();
-                            }
+                            wait();
                         }
                         Ok(Child) => {
-
-                            if let Some(thing) = commands_vec.get(0) {
-                                if let Some(_) = commands_vec.get(1) {
-                                    close(reader).unwrap();
-                                    dup2(writer, 1).unwrap();
-                                }
-                                self.execute(thing);
+                            if let Some(second) = commands_vec.get(1) {
+                                close(1).unwrap();
+                                close(writer).unwrap();
+                                dup2(reader, 0).unwrap();
+                                self.execute(second);
                             }
                         }
-
                         Err(_) => println!("Fatal error: Fork failed"),
                     }
 
-
-
                 }
 
             },