From 3e3f5e43132da81cb001b0c0bd61bb18333cda23 Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Thu, 16 Jul 2020 22:25:27 +0500
Subject: [PATCH] Added files input/output redirection

---
 README.md        |  5 ++--
 foo              |  1 +
 include/shell.h  |  1 +
 src/line_parce.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++--
 test.txt         |  1 +
 test.txt;cat     |  1 +
 6 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 foo
 create mode 100644 test.txt
 create mode 100644 test.txt;cat

diff --git a/README.md b/README.md
index 06344de..ee74e2d 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Running commands in separate process and termination them with `ctrl+c`
 * `cd`, `exit` and `exec` builtin commands
 * Files and commands from `/usr/bin` autocompletion on `Tab` keypress
-* History of commands and navigation or search through it with `up/down` keys
+* History of commands and navigation or search through it with `up`/`down` keys
 * Username, ip address and current path in prompt before each command input
 * Show previous command return status in prompt and invert it with `!`, separated with space, specified before it
 * Running multiple commands separated by `;`, `&&` or `||`
 * Expand `*` wildcards
-* Commands I/O redirection with `|` pipes
+* Commands I/O redirection with `|` pipes and `>`, `<`, `>>`, `<>` file input/output
 
 # Builtin commands
 * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@@ -22,7 +22,6 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * `exec`: executes entered command and exits
   
 # TODO
-* Files input/output
 * Replace linux `echo` command with builtin one with support of environmental variables
 * Environmental variables
 * `Ctrl+Z` running programm with `fd`
diff --git a/foo b/foo
new file mode 100644
index 0000000..5da2c6b
--- /dev/null
+++ b/foo
@@ -0,0 +1 @@
+zim
diff --git a/include/shell.h b/include/shell.h
index a7bd61d..f2568d5 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -9,6 +9,7 @@
 #include <ifaddrs.h>
 #include <glob.h>
 #include <stdbool.h>
+#include <fcntl.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/line_parce.c b/src/line_parce.c
index 09847e9..e1d521f 100644
--- a/src/line_parce.c
+++ b/src/line_parce.c
@@ -151,6 +151,75 @@ cmds_p *process_line(char *line)
             curr_cmd->pipes_am++;
             curr_pipe = curr_pipe->next;
         }
+        else if (line[i] == '>' || line[i] == '<')
+        {
+            int flags = 0;
+            int f = 0;
+
+            if (line[i] == '>' && line[i + 1] == '>')
+            {
+                flags = O_CREAT | O_APPEND | O_WRONLY;
+                i++;
+                tmp++;
+                f = 0;
+            }
+            else if (line[i] == '>')
+            {
+                flags = O_CREAT | O_TRUNC | O_WRONLY;
+                f = 0;
+            }
+            else if (line[i] == '<' && line[i + 1] == '>')
+            {
+                flags = O_CREAT | O_RDWR;
+                i++;
+                tmp++;
+                f = 1;
+            }
+            else if (line[i] == '<')
+            {
+                flags = O_RDONLY;
+                f = 2;
+            }
+
+            i++;
+            tmp++;
+
+            if (line[i] == ' ')
+            {
+                i++;
+                tmp++;
+            }
+
+            int j = i;
+            for (; j < line_size; j++)
+                if (line[j] == ' ' || line[j] == '|' || line[j] == '&' || line[j] == ';')
+                    break;
+
+            free_tmp[j] = '\0';
+
+            if (tmp[0] == '"')
+                tmp++;
+            if (free_tmp[j - 1] == '"')
+                free_tmp[j - 1] = '\0';
+
+            int ffd;
+            if ((ffd = open(tmp, flags)) < 0)
+            {
+                perror("file redirection: open");
+                return NULL;
+            }
+
+            if (f == 0)
+                curr_pipe->pipefd[1] = ffd;
+            else if (f == 1)
+                for (int k = 0; k < 2; k++)
+                    curr_pipe->pipefd[k] = ffd;
+            else if (f == 2)
+                curr_pipe->pipefd[0] = ffd;
+
+            tmp += j - i + 1;
+            i = j;
+        }
         else if (line[i] == ' ')
         {
             free_tmp[i] = '\0';
@@ -200,8 +269,8 @@ cmds_p *process_line(char *line)
         curr_pipe->args = realloc(curr_pipe->args, sizeof(char *) * (curr_pipe->args_am + 1));
         curr_pipe->args[curr_pipe->args_am] = NULL;
     }
-
-    curr_pipe->pipefd[1] = STDOUT_FILENO;
+    if (curr_pipe->pipefd[1] < 0)
+        curr_pipe->pipefd[1] = STDOUT_FILENO;
 
     return coms;
 }
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..345e6ae
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+Test
diff --git a/test.txt;cat b/test.txt;cat
new file mode 100644
index 0000000..7ba49bb
--- /dev/null
+++ b/test.txt;cat
@@ -0,0 +1 @@
+Test test.txt