Add basic command line

* Initialize terminal and signal handling
* Add basic repl that doesn't do anything yet
* Add handling for Ctrl-C, Ctrl-D and Ctrl-\ in interactive mode

diff --git a/Makefile b/Makefile
index 6fe15b6fd305274c9b3036ede7ebf5a228014742..dfe7a30da61cf30ce054b6b22731a4329472228b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@ NAME    := minishell
 CC      =  cc
 CFLAGS  =  -Wall -Wextra -Werror
 LIB_DIR = lib
-LIBS    =  -L $(LIB_DIR)/libft -lft
+LIBS    =  -L $(LIB_DIR)/libft -lft -lreadline
 HEADERS =  -I include -I $(LIB_DIR)/libft
 
 VPATH   := src
-SRC     := main.c debug_tools.c
+SRC     := main.c debug_tools.c init.c signal_handling.c repl.c
 
 OBJ_DIR := _obj
 OBJ     := $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o))

diff --git a/include/minishell.h b/include/minishell.h
index 9ebc58ffdeadb334d991524de4b7dc43ff415eb3..4f85144e2173b7b28b74ae36ffb9739679d348e3 100644 (file)
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 17:14:49 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/06/24 18:51:30 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/06/25 13:52:24 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,5 +15,16 @@
 
 # include "debug_tools.h"
 # include "libft.h"
+# include <stdio.h>
+# include <readline/readline.h>
+# include <signal.h>
+# include <stdlib.h>
+# include <termios.h>
+# include <unistd.h>
+
+int            init(void);
+int            init_signal_handling(void);
+
+void   repl(const char *prompt);
 
 #endif

diff --git a/src/debug_tools.c b/src/debug_tools.c
index e75c0a7e1104be0a9b6ab072b63f4855469b0240..ccf21642c9fc1f23143b9fbc0281a6ee4654b86b 100644 (file)
--- a/src/debug_tools.c
+++ b/src/debug_tools.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/24 15:34:14 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/06/25 12:48:20 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/06/25 13:13:18 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

diff --git a/src/init.c b/src/init.c
new file mode 100644 (file)
index 0000000..fd2c8ac
--- /dev/null
+++ b/src/init.c
@@ -0,0 +1,33 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   init.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/24 15:02:24 by dkaiser           #+#    #+#             */
+/*   Updated: 2024/06/24 15:25:57 by dkaiser          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static void    init_terminal(void);
+
+int    init(void)
+{
+       int     result;
+
+       init_terminal();
+       result = init_signal_handling();
+       return (result);
+}
+
+static void    init_terminal(void)
+{
+       struct termios  term;
+
+       tcgetattr(0, &term);
+       term.c_lflag &= ~ECHOCTL;
+       tcsetattr(0, TCSANOW, &term);
+}

diff --git a/src/main.c b/src/main.c
index 2699de34a884f1445d5c0e56c0ee87ee4a66891b..016ede6d7afaa46dbf00db7cc8b3b8c1f52393f3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 17:14:03 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/06/22 17:14:36 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/06/25 13:58:24 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,5 +14,7 @@
 
 int    main(void)
 {
-       return (0);
+       if (init())
+               return (1);
+       repl("Minishell $ ");
 }

diff --git a/src/repl.c b/src/repl.c
new file mode 100644 (file)
index 0000000..f97af6c
--- /dev/null
+++ b/src/repl.c
@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   repl.c                                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/24 16:07:04 by dkaiser           #+#    #+#             */
+/*   Updated: 2024/06/25 13:50:19 by dkaiser          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+void   repl(const char *prompt)
+{
+       char    *input;
+
+       while (1)
+       {
+               input = readline(prompt);
+               if (input == NULL)
+                       return ;
+               free(input);
+       }
+}

diff --git a/src/signal_handling.c b/src/signal_handling.c
new file mode 100644 (file)
index 0000000..a19fa94
--- /dev/null
+++ b/src/signal_handling.c
@@ -0,0 +1,38 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   signal_handling.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/24 15:08:43 by dkaiser           #+#    #+#             */
+/*   Updated: 2024/06/25 13:33:26 by dkaiser          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static void    handle_sigint(int status);
+static void    handle_sigquit(int status);
+
+int    init_signal_handling(void)
+{
+       if (signal(SIGINT, &handle_sigint) == SIG_ERR)
+               return (1);
+       if (signal(SIGQUIT, &handle_sigquit) == SIG_ERR)
+               return (1);
+       return (0);
+}
+
+static void    handle_sigint(__attribute__((unused)) int status)
+{
+       write(1, "\n", 1);
+       rl_replace_line("", 0);
+       rl_on_new_line();
+       rl_redisplay();
+}
+
+static void    handle_sigquit(__attribute__((unused)) int status)
+{
+       rl_redisplay();
+}