read script init

42sh/Makefile

@@ -72,6 +72,11 @@ $(D_OBJ)/%.o: $(D_SRC)/job-control/%.c includes/job_control.h
 	@$(CC) $(O_INC) $(W_FLAGS) -c $< -o $@ $(D_FLAGS)
 	@echo "Compiling "$<"..."
 
+$(D_OBJ)/%.o: $(D_SRC)/read-script/%.c includes/readscript.h
+	@$(MKDIR) $(D_OBJ)
+	@$(CC) $(O_INC) $(W_FLAGS) -c $< -o $@ $(D_FLAGS)
+	@echo "Compiling "$<"..."
+
 libft/libft.a: libft/src/*/*.c
 	@echo "libft/libft.a"
 	@$(MAKE) -C libft 2>/dev/null

42sh/includes/builtin.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/13 17:21:56 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/09 16:57:22 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/19 20:54:43 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/exec.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/27 20:29:56 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/12 13:18:27 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/19 21:03:13 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/ft_curs.h

@@ -6,7 +6,7 @@
 /*   By: sbenning <sbenning@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/08 16:34:51 by sbenning          #+#    #+#             */
-/*   Updated: 2016/12/09 17:08:52 by sbenning         ###   ########.fr       */
+/*   Updated: 2017/01/19 21:53:40 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/ft_input.h

@@ -6,7 +6,7 @@
 /*   By: sbenning <sbenning@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/09 02:05:22 by sbenning          #+#    #+#             */
-/*   Updated: 2017/01/10 11:45:38 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/21 21:49:00 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/ft_readline.h

@@ -6,7 +6,7 @@
 /*   By: sbenning <sbenning@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/08 18:02:25 by sbenning          #+#    #+#             */
-/*   Updated: 2017/01/11 17:31:09 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/21 23:42:07 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/job_control.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/10 16:55:09 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/09 16:56:18 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/19 21:51:10 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/lexer.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/01 12:15:50 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/12 14:57:41 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/22 00:37:19 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/minishell.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/10 13:07:44 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/11 17:17:16 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/22 00:37:20 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,7 @@
 
 # include "libft.h"
 
+# include "readscript.h"
 # include "types.h"
 # include "lexer.h"
 # include "parser.h"
@@ -46,6 +47,7 @@ struct	s_comp
 
 # define SHELL_MSG_NOJOBC	"no job-control"
 
+
 struct	s_data
 {
 	char	**env;
@@ -56,6 +58,7 @@ struct	s_data
 	t_comp	comp;
 	t_exec	exec;
 	t_jobc	jobc;
+	t_script	 script;
 };
 
 extern t_stof	g_builtins[];

42sh/includes/parser.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/01 12:15:54 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/11 17:06:17 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/20 18:26:51 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

42sh/includes/readscript.h

@@ -0,0 +1,43 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   read_script.h                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: ariard <marvin@42.fr>                      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2017/01/21 22:50:22 by ariard            #+#    #+#             */
+/*   Updated: 2017/01/22 00:37:21 by ariard           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef READSCRIPT_H
+# define READSCRIPT_H
+
+/*
+ * input : destination buffer
+ * b_size : allocated size of the destination buffer
+ * used : acutal used size in the destination buffer
+ * q_size : number of elements in the queue
+ * queue : list of queued lines, FIFO
+*/
+
+struct s_script 
+{
+	char	*buffer;
+	int		b_size;
+	int		used;
+	int		q_size;
+	t_list	*queue;
+};
+
+typedef struct s_script	 t_script;
+
+/*
+ * Read_script setup/cleanup
+*/
+
+int			rs_setup(t_script *script);
+
+int			ft_read_script();
+
+#endif

42sh/includes/types.h

@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/13 17:11:48 by jhalford          #+#    #+#             */
-/*   Updated: 2017/01/10 12:45:35 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/01/19 21:52:47 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */