diff --git a/42sh/Makefile b/42sh/Makefile index 8dcf5189..2e558060 100644 --- a/42sh/Makefile +++ b/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 diff --git a/42sh/includes/builtin.h b/42sh/includes/builtin.h index 42f2543a..4ffb9a44 100644 --- a/42sh/includes/builtin.h +++ b/42sh/includes/builtin.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/exec.h b/42sh/includes/exec.h index ea6efda7..e9f22dc9 100644 --- a/42sh/includes/exec.h +++ b/42sh/includes/exec.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/ft_curs.h b/42sh/includes/ft_curs.h index 02f3f314..1f17a2c7 100644 --- a/42sh/includes/ft_curs.h +++ b/42sh/includes/ft_curs.h @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/ft_input.h b/42sh/includes/ft_input.h index 5e8c59a3..3e2188b4 100644 --- a/42sh/includes/ft_input.h +++ b/42sh/includes/ft_input.h @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/ft_readline.h b/42sh/includes/ft_readline.h index f8aeb60e..acc96bba 100644 --- a/42sh/includes/ft_readline.h +++ b/42sh/includes/ft_readline.h @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/job_control.h b/42sh/includes/job_control.h index bea10d93..6cd51a51 100644 --- a/42sh/includes/job_control.h +++ b/42sh/includes/job_control.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/lexer.h b/42sh/includes/lexer.h index 03276719..ec98c235 100644 --- a/42sh/includes/lexer.h +++ b/42sh/includes/lexer.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/minishell.h b/42sh/includes/minishell.h index 02b05202..47191403 100644 --- a/42sh/includes/minishell.h +++ b/42sh/includes/minishell.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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[]; diff --git a/42sh/includes/parser.h b/42sh/includes/parser.h index 3c8a7fed..9b7025b9 100644 --- a/42sh/includes/parser.h +++ b/42sh/includes/parser.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/readscript.h b/42sh/includes/readscript.h new file mode 100644 index 00000000..2334db34 --- /dev/null +++ b/42sh/includes/readscript.h @@ -0,0 +1,43 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* read_script.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ariard +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* 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 diff --git a/42sh/includes/types.h b/42sh/includes/types.h index af8071d0..e5168947 100644 --- a/42sh/includes/types.h +++ b/42sh/includes/types.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/obj/ast_free.o b/42sh/obj/ast_free.o new file mode 100644 index 00000000..ddd70b60 Binary files /dev/null and b/42sh/obj/ast_free.o differ diff --git a/42sh/obj/builtin_bg.o b/42sh/obj/builtin_bg.o new file mode 100644 index 00000000..48edac7b Binary files /dev/null and b/42sh/obj/builtin_bg.o differ diff --git a/42sh/obj/builtin_cd.o b/42sh/obj/builtin_cd.o new file mode 100644 index 00000000..8f26a5dd Binary files /dev/null and b/42sh/obj/builtin_cd.o differ diff --git a/42sh/obj/builtin_echo.o b/42sh/obj/builtin_echo.o new file mode 100644 index 00000000..ebf062b8 Binary files /dev/null and b/42sh/obj/builtin_echo.o differ diff --git a/42sh/obj/builtin_env.o b/42sh/obj/builtin_env.o new file mode 100644 index 00000000..245bf634 Binary files /dev/null and b/42sh/obj/builtin_env.o differ diff --git a/42sh/obj/builtin_exit.o b/42sh/obj/builtin_exit.o new file mode 100644 index 00000000..f7afd209 Binary files /dev/null and b/42sh/obj/builtin_exit.o differ diff --git a/42sh/obj/builtin_fg.o b/42sh/obj/builtin_fg.o new file mode 100644 index 00000000..7bdf8bfb Binary files /dev/null and b/42sh/obj/builtin_fg.o differ diff --git a/42sh/obj/builtin_jobs.o b/42sh/obj/builtin_jobs.o new file mode 100644 index 00000000..86525ff9 Binary files /dev/null and b/42sh/obj/builtin_jobs.o differ diff --git a/42sh/obj/builtin_setenv.o b/42sh/obj/builtin_setenv.o new file mode 100644 index 00000000..aa77f493 Binary files /dev/null and b/42sh/obj/builtin_setenv.o differ diff --git a/42sh/obj/builtin_unsetenv.o b/42sh/obj/builtin_unsetenv.o new file mode 100644 index 00000000..90f3e71e Binary files /dev/null and b/42sh/obj/builtin_unsetenv.o differ diff --git a/42sh/obj/command_getoutput.o b/42sh/obj/command_getoutput.o new file mode 100644 index 00000000..2cb14198 Binary files /dev/null and b/42sh/obj/command_getoutput.o differ diff --git a/42sh/obj/curs_ask.o b/42sh/obj/curs_ask.o new file mode 100644 index 00000000..7ed187e9 Binary files /dev/null and b/42sh/obj/curs_ask.o differ diff --git a/42sh/obj/curs_clear.o b/42sh/obj/curs_clear.o new file mode 100644 index 00000000..ba1fc3c4 Binary files /dev/null and b/42sh/obj/curs_clear.o differ diff --git a/42sh/obj/curs_goto.o b/42sh/obj/curs_goto.o new file mode 100644 index 00000000..034d9dfb Binary files /dev/null and b/42sh/obj/curs_goto.o differ diff --git a/42sh/obj/curs_move.o b/42sh/obj/curs_move.o new file mode 100644 index 00000000..67d897da Binary files /dev/null and b/42sh/obj/curs_move.o differ diff --git a/42sh/obj/curs_setup.o b/42sh/obj/curs_setup.o new file mode 100644 index 00000000..b82ee955 Binary files /dev/null and b/42sh/obj/curs_setup.o differ diff --git a/42sh/obj/curs_single.o b/42sh/obj/curs_single.o new file mode 100644 index 00000000..0e2176f6 Binary files /dev/null and b/42sh/obj/curs_single.o differ diff --git a/42sh/obj/curs_term_setup.o b/42sh/obj/curs_term_setup.o new file mode 100644 index 00000000..95fabc3a Binary files /dev/null and b/42sh/obj/curs_term_setup.o differ diff --git a/42sh/obj/curs_write.o b/42sh/obj/curs_write.o new file mode 100644 index 00000000..4949c38e Binary files /dev/null and b/42sh/obj/curs_write.o differ diff --git a/42sh/obj/data_exit.o b/42sh/obj/data_exit.o new file mode 100644 index 00000000..578a235a Binary files /dev/null and b/42sh/obj/data_exit.o differ diff --git a/42sh/obj/data_init.o b/42sh/obj/data_init.o new file mode 100644 index 00000000..ab89dbcb Binary files /dev/null and b/42sh/obj/data_init.o differ diff --git a/42sh/obj/data_singleton.o b/42sh/obj/data_singleton.o new file mode 100644 index 00000000..2464ca28 Binary files /dev/null and b/42sh/obj/data_singleton.o differ diff --git a/42sh/obj/do_job_notification.o b/42sh/obj/do_job_notification.o new file mode 100644 index 00000000..eba96621 Binary files /dev/null and b/42sh/obj/do_job_notification.o differ diff --git a/42sh/obj/exec_ampersand.o b/42sh/obj/exec_ampersand.o new file mode 100644 index 00000000..49f10fe0 Binary files /dev/null and b/42sh/obj/exec_ampersand.o differ diff --git a/42sh/obj/exec_and_if.o b/42sh/obj/exec_and_if.o new file mode 100644 index 00000000..e682d8ee Binary files /dev/null and b/42sh/obj/exec_and_if.o differ diff --git a/42sh/obj/exec_command.o b/42sh/obj/exec_command.o new file mode 100644 index 00000000..844d2445 Binary files /dev/null and b/42sh/obj/exec_command.o differ diff --git a/42sh/obj/exec_dgreat.o b/42sh/obj/exec_dgreat.o new file mode 100644 index 00000000..9a362fe9 Binary files /dev/null and b/42sh/obj/exec_dgreat.o differ diff --git a/42sh/obj/exec_great.o b/42sh/obj/exec_great.o new file mode 100644 index 00000000..1a00d64d Binary files /dev/null and b/42sh/obj/exec_great.o differ diff --git a/42sh/obj/exec_less.o b/42sh/obj/exec_less.o new file mode 100644 index 00000000..ee9bfe9c Binary files /dev/null and b/42sh/obj/exec_less.o differ diff --git a/42sh/obj/exec_or_if.o b/42sh/obj/exec_or_if.o new file mode 100644 index 00000000..f9444aa9 Binary files /dev/null and b/42sh/obj/exec_or_if.o differ diff --git a/42sh/obj/exec_pipe.o b/42sh/obj/exec_pipe.o new file mode 100644 index 00000000..e0daf6ad Binary files /dev/null and b/42sh/obj/exec_pipe.o differ diff --git a/42sh/obj/exec_semi.o b/42sh/obj/exec_semi.o new file mode 100644 index 00000000..e5914e29 Binary files /dev/null and b/42sh/obj/exec_semi.o differ diff --git a/42sh/obj/ft_exec.o b/42sh/obj/ft_exec.o new file mode 100644 index 00000000..f597c98c Binary files /dev/null and b/42sh/obj/ft_exec.o differ diff --git a/42sh/obj/ft_findexec.o b/42sh/obj/ft_findexec.o new file mode 100644 index 00000000..8621623e Binary files /dev/null and b/42sh/obj/ft_findexec.o differ diff --git a/42sh/obj/ft_parse.o b/42sh/obj/ft_parse.o new file mode 100644 index 00000000..c327931a Binary files /dev/null and b/42sh/obj/ft_parse.o differ diff --git a/42sh/obj/ft_post_tokenize.o b/42sh/obj/ft_post_tokenize.o new file mode 100644 index 00000000..c755dcc9 Binary files /dev/null and b/42sh/obj/ft_post_tokenize.o differ diff --git a/42sh/obj/ft_putast.o b/42sh/obj/ft_putast.o new file mode 100644 index 00000000..333c48d2 Binary files /dev/null and b/42sh/obj/ft_putast.o differ diff --git a/42sh/obj/ft_putast2.o b/42sh/obj/ft_putast2.o new file mode 100644 index 00000000..36b26fad Binary files /dev/null and b/42sh/obj/ft_putast2.o differ diff --git a/42sh/obj/ft_read_script.o b/42sh/obj/ft_read_script.o new file mode 100644 index 00000000..c2bfbee1 Binary files /dev/null and b/42sh/obj/ft_read_script.o differ diff --git a/42sh/obj/ft_readline.o b/42sh/obj/ft_readline.o new file mode 100644 index 00000000..794f546e Binary files /dev/null and b/42sh/obj/ft_readline.o differ diff --git a/42sh/obj/ft_tokenize.o b/42sh/obj/ft_tokenize.o new file mode 100644 index 00000000..f8ba9394 Binary files /dev/null and b/42sh/obj/ft_tokenize.o differ diff --git a/42sh/obj/get_lexer_state.o b/42sh/obj/get_lexer_state.o new file mode 100644 index 00000000..badce7ae Binary files /dev/null and b/42sh/obj/get_lexer_state.o differ diff --git a/42sh/obj/is_builtin.o b/42sh/obj/is_builtin.o new file mode 100644 index 00000000..c30f21c4 Binary files /dev/null and b/42sh/obj/is_builtin.o differ diff --git a/42sh/obj/job_addprocess.o b/42sh/obj/job_addprocess.o new file mode 100644 index 00000000..9c06fc42 Binary files /dev/null and b/42sh/obj/job_addprocess.o differ diff --git a/42sh/obj/job_cmp_id.o b/42sh/obj/job_cmp_id.o new file mode 100644 index 00000000..7318df93 Binary files /dev/null and b/42sh/obj/job_cmp_id.o differ diff --git a/42sh/obj/job_format.o b/42sh/obj/job_format.o new file mode 100644 index 00000000..10b11d93 Binary files /dev/null and b/42sh/obj/job_format.o differ diff --git a/42sh/obj/job_format_head.o b/42sh/obj/job_format_head.o new file mode 100644 index 00000000..ca147298 Binary files /dev/null and b/42sh/obj/job_format_head.o differ diff --git a/42sh/obj/job_free.o b/42sh/obj/job_free.o new file mode 100644 index 00000000..3cf595c8 Binary files /dev/null and b/42sh/obj/job_free.o differ diff --git a/42sh/obj/job_getprocess.o b/42sh/obj/job_getprocess.o new file mode 100644 index 00000000..73c9484f Binary files /dev/null and b/42sh/obj/job_getprocess.o differ diff --git a/42sh/obj/job_getrank.o b/42sh/obj/job_getrank.o new file mode 100644 index 00000000..ac357508 Binary files /dev/null and b/42sh/obj/job_getrank.o differ diff --git a/42sh/obj/job_is_completed.o b/42sh/obj/job_is_completed.o new file mode 100644 index 00000000..39262e61 Binary files /dev/null and b/42sh/obj/job_is_completed.o differ diff --git a/42sh/obj/job_is_stopped.o b/42sh/obj/job_is_stopped.o new file mode 100644 index 00000000..a2e41225 Binary files /dev/null and b/42sh/obj/job_is_stopped.o differ diff --git a/42sh/obj/job_kill_all.o b/42sh/obj/job_kill_all.o new file mode 100644 index 00000000..902a4507 Binary files /dev/null and b/42sh/obj/job_kill_all.o differ diff --git a/42sh/obj/job_notify_change.o b/42sh/obj/job_notify_change.o new file mode 100644 index 00000000..016ee8a8 Binary files /dev/null and b/42sh/obj/job_notify_change.o differ diff --git a/42sh/obj/job_notify_new.o b/42sh/obj/job_notify_new.o new file mode 100644 index 00000000..bca50477 Binary files /dev/null and b/42sh/obj/job_notify_new.o differ diff --git a/42sh/obj/job_remove.o b/42sh/obj/job_remove.o new file mode 100644 index 00000000..6c8354b4 Binary files /dev/null and b/42sh/obj/job_remove.o differ diff --git a/42sh/obj/job_update_id.o b/42sh/obj/job_update_id.o new file mode 100644 index 00000000..4b01e5c5 Binary files /dev/null and b/42sh/obj/job_update_id.o differ diff --git a/42sh/obj/job_update_status.o b/42sh/obj/job_update_status.o new file mode 100644 index 00000000..3d4cf870 Binary files /dev/null and b/42sh/obj/job_update_status.o differ diff --git a/42sh/obj/job_wait.o b/42sh/obj/job_wait.o new file mode 100644 index 00000000..a203492e Binary files /dev/null and b/42sh/obj/job_wait.o differ diff --git a/42sh/obj/launch_process.o b/42sh/obj/launch_process.o new file mode 100644 index 00000000..f3ac076e Binary files /dev/null and b/42sh/obj/launch_process.o differ diff --git a/42sh/obj/lexer_backslash.o b/42sh/obj/lexer_backslash.o new file mode 100644 index 00000000..59eca88c Binary files /dev/null and b/42sh/obj/lexer_backslash.o differ diff --git a/42sh/obj/lexer_default.o b/42sh/obj/lexer_default.o new file mode 100644 index 00000000..bb8f644d Binary files /dev/null and b/42sh/obj/lexer_default.o differ diff --git a/42sh/obj/lexer_delim.o b/42sh/obj/lexer_delim.o new file mode 100644 index 00000000..7e5d553f Binary files /dev/null and b/42sh/obj/lexer_delim.o differ diff --git a/42sh/obj/lexer_dquote.o b/42sh/obj/lexer_dquote.o new file mode 100644 index 00000000..e0890780 Binary files /dev/null and b/42sh/obj/lexer_dquote.o differ diff --git a/42sh/obj/lexer_great.o b/42sh/obj/lexer_great.o new file mode 100644 index 00000000..d0803dfe Binary files /dev/null and b/42sh/obj/lexer_great.o differ diff --git a/42sh/obj/lexer_greatand.o b/42sh/obj/lexer_greatand.o new file mode 100644 index 00000000..abad67ab Binary files /dev/null and b/42sh/obj/lexer_greatand.o differ diff --git a/42sh/obj/lexer_less.o b/42sh/obj/lexer_less.o new file mode 100644 index 00000000..a4204ee6 Binary files /dev/null and b/42sh/obj/lexer_less.o differ diff --git a/42sh/obj/lexer_lessand.o b/42sh/obj/lexer_lessand.o new file mode 100644 index 00000000..07ab404a Binary files /dev/null and b/42sh/obj/lexer_lessand.o differ diff --git a/42sh/obj/lexer_number.o b/42sh/obj/lexer_number.o new file mode 100644 index 00000000..fe70e835 Binary files /dev/null and b/42sh/obj/lexer_number.o differ diff --git a/42sh/obj/lexer_quote.o b/42sh/obj/lexer_quote.o new file mode 100644 index 00000000..79d4cf77 Binary files /dev/null and b/42sh/obj/lexer_quote.o differ diff --git a/42sh/obj/lexer_sep.o b/42sh/obj/lexer_sep.o new file mode 100644 index 00000000..e081e5b5 Binary files /dev/null and b/42sh/obj/lexer_sep.o differ diff --git a/42sh/obj/lexer_special.o b/42sh/obj/lexer_special.o new file mode 100644 index 00000000..f7b4e7af Binary files /dev/null and b/42sh/obj/lexer_special.o differ diff --git a/42sh/obj/lexer_var.o b/42sh/obj/lexer_var.o new file mode 100644 index 00000000..03d5ee2b Binary files /dev/null and b/42sh/obj/lexer_var.o differ diff --git a/42sh/obj/lexer_word.o b/42sh/obj/lexer_word.o new file mode 100644 index 00000000..74ec9aef Binary files /dev/null and b/42sh/obj/lexer_word.o differ diff --git a/42sh/obj/main.o b/42sh/obj/main.o new file mode 100644 index 00000000..070ee71c Binary files /dev/null and b/42sh/obj/main.o differ diff --git a/42sh/obj/mark_job_as_running.o b/42sh/obj/mark_job_as_running.o new file mode 100644 index 00000000..15ff8cf5 Binary files /dev/null and b/42sh/obj/mark_job_as_running.o differ diff --git a/42sh/obj/parse_dgreat.o b/42sh/obj/parse_dgreat.o new file mode 100644 index 00000000..2bad78c5 Binary files /dev/null and b/42sh/obj/parse_dgreat.o differ diff --git a/42sh/obj/parse_dless.o b/42sh/obj/parse_dless.o new file mode 100644 index 00000000..ad9db623 Binary files /dev/null and b/42sh/obj/parse_dless.o differ diff --git a/42sh/obj/parse_great.o b/42sh/obj/parse_great.o new file mode 100644 index 00000000..3e1581a1 Binary files /dev/null and b/42sh/obj/parse_great.o differ diff --git a/42sh/obj/parse_greatand.o b/42sh/obj/parse_greatand.o new file mode 100644 index 00000000..317a5abc Binary files /dev/null and b/42sh/obj/parse_greatand.o differ diff --git a/42sh/obj/parse_less.o b/42sh/obj/parse_less.o new file mode 100644 index 00000000..2bc27796 Binary files /dev/null and b/42sh/obj/parse_less.o differ diff --git a/42sh/obj/parse_lessand.o b/42sh/obj/parse_lessand.o new file mode 100644 index 00000000..beb22549 Binary files /dev/null and b/42sh/obj/parse_lessand.o differ diff --git a/42sh/obj/parse_separator.o b/42sh/obj/parse_separator.o new file mode 100644 index 00000000..d04942c8 Binary files /dev/null and b/42sh/obj/parse_separator.o differ diff --git a/42sh/obj/parse_subshell.o b/42sh/obj/parse_subshell.o new file mode 100644 index 00000000..02223c9c Binary files /dev/null and b/42sh/obj/parse_subshell.o differ diff --git a/42sh/obj/parse_word.o b/42sh/obj/parse_word.o new file mode 100644 index 00000000..38004b4f Binary files /dev/null and b/42sh/obj/parse_word.o differ diff --git a/42sh/obj/process_cmp_pid.o b/42sh/obj/process_cmp_pid.o new file mode 100644 index 00000000..cba88d1e Binary files /dev/null and b/42sh/obj/process_cmp_pid.o differ diff --git a/42sh/obj/process_format.o b/42sh/obj/process_format.o new file mode 100644 index 00000000..99c54e7b Binary files /dev/null and b/42sh/obj/process_format.o differ diff --git a/42sh/obj/process_free.o b/42sh/obj/process_free.o new file mode 100644 index 00000000..e1175ee8 Binary files /dev/null and b/42sh/obj/process_free.o differ diff --git a/42sh/obj/process_mark_status.o b/42sh/obj/process_mark_status.o new file mode 100644 index 00000000..4a4f743f Binary files /dev/null and b/42sh/obj/process_mark_status.o differ diff --git a/42sh/obj/process_redirect.o b/42sh/obj/process_redirect.o new file mode 100644 index 00000000..fe05bc42 Binary files /dev/null and b/42sh/obj/process_redirect.o differ diff --git a/42sh/obj/process_reset.o b/42sh/obj/process_reset.o new file mode 100644 index 00000000..0576bb5f Binary files /dev/null and b/42sh/obj/process_reset.o differ diff --git a/42sh/obj/process_setexec.o b/42sh/obj/process_setexec.o new file mode 100644 index 00000000..b1678ef8 Binary files /dev/null and b/42sh/obj/process_setexec.o differ diff --git a/42sh/obj/process_setgroup.o b/42sh/obj/process_setgroup.o new file mode 100644 index 00000000..c9bd04a2 Binary files /dev/null and b/42sh/obj/process_setgroup.o differ diff --git a/42sh/obj/put_job_in_background.o b/42sh/obj/put_job_in_background.o new file mode 100644 index 00000000..54054923 Binary files /dev/null and b/42sh/obj/put_job_in_background.o differ diff --git a/42sh/obj/put_job_in_foreground.o b/42sh/obj/put_job_in_foreground.o new file mode 100644 index 00000000..ffa0beb3 Binary files /dev/null and b/42sh/obj/put_job_in_foreground.o differ diff --git a/42sh/obj/reduce_bquotes.o b/42sh/obj/reduce_bquotes.o new file mode 100644 index 00000000..533690d1 Binary files /dev/null and b/42sh/obj/reduce_bquotes.o differ diff --git a/42sh/obj/reduce_parens.o b/42sh/obj/reduce_parens.o new file mode 100644 index 00000000..53451298 Binary files /dev/null and b/42sh/obj/reduce_parens.o differ diff --git a/42sh/obj/rl_bitset.o b/42sh/obj/rl_bitset.o new file mode 100644 index 00000000..e0e5f361 Binary files /dev/null and b/42sh/obj/rl_bitset.o differ diff --git a/42sh/obj/rl_clear_function.o b/42sh/obj/rl_clear_function.o new file mode 100644 index 00000000..38b5dc8b Binary files /dev/null and b/42sh/obj/rl_clear_function.o differ diff --git a/42sh/obj/rl_clipboard_function.o b/42sh/obj/rl_clipboard_function.o new file mode 100644 index 00000000..a3eadebb Binary files /dev/null and b/42sh/obj/rl_clipboard_function.o differ diff --git a/42sh/obj/rl_clipboard_utility.o b/42sh/obj/rl_clipboard_utility.o new file mode 100644 index 00000000..f674a8f0 Binary files /dev/null and b/42sh/obj/rl_clipboard_utility.o differ diff --git a/42sh/obj/rl_comp_function.o b/42sh/obj/rl_comp_function.o new file mode 100644 index 00000000..5a971799 Binary files /dev/null and b/42sh/obj/rl_comp_function.o differ diff --git a/42sh/obj/rl_default_function.o b/42sh/obj/rl_default_function.o new file mode 100644 index 00000000..24cc459a Binary files /dev/null and b/42sh/obj/rl_default_function.o differ diff --git a/42sh/obj/rl_display.o b/42sh/obj/rl_display.o new file mode 100644 index 00000000..98cdb4f6 Binary files /dev/null and b/42sh/obj/rl_display.o differ diff --git a/42sh/obj/rl_dynamic_buffer.o b/42sh/obj/rl_dynamic_buffer.o new file mode 100644 index 00000000..ecca9fe2 Binary files /dev/null and b/42sh/obj/rl_dynamic_buffer.o differ diff --git a/42sh/obj/rl_long_move_function.o b/42sh/obj/rl_long_move_function.o new file mode 100644 index 00000000..79b6abb2 Binary files /dev/null and b/42sh/obj/rl_long_move_function.o differ diff --git a/42sh/obj/rl_merge_line.o b/42sh/obj/rl_merge_line.o new file mode 100644 index 00000000..8d8474e7 Binary files /dev/null and b/42sh/obj/rl_merge_line.o differ diff --git a/42sh/obj/rl_page_move_function.o b/42sh/obj/rl_page_move_function.o new file mode 100644 index 00000000..3e2d48ff Binary files /dev/null and b/42sh/obj/rl_page_move_function.o differ diff --git a/42sh/obj/rl_prompt.o b/42sh/obj/rl_prompt.o new file mode 100644 index 00000000..632bfe64 Binary files /dev/null and b/42sh/obj/rl_prompt.o differ diff --git a/42sh/obj/rl_quoting_function.o b/42sh/obj/rl_quoting_function.o new file mode 100644 index 00000000..30432190 Binary files /dev/null and b/42sh/obj/rl_quoting_function.o differ diff --git a/42sh/obj/rl_remove_function.o b/42sh/obj/rl_remove_function.o new file mode 100644 index 00000000..d36ad296 Binary files /dev/null and b/42sh/obj/rl_remove_function.o differ diff --git a/42sh/obj/rl_setup.o b/42sh/obj/rl_setup.o new file mode 100644 index 00000000..b153f269 Binary files /dev/null and b/42sh/obj/rl_setup.o differ diff --git a/42sh/obj/rl_short_move_function.o b/42sh/obj/rl_short_move_function.o new file mode 100644 index 00000000..979389ea Binary files /dev/null and b/42sh/obj/rl_short_move_function.o differ diff --git a/42sh/obj/rl_stack_line.o b/42sh/obj/rl_stack_line.o new file mode 100644 index 00000000..9d273789 Binary files /dev/null and b/42sh/obj/rl_stack_line.o differ diff --git a/42sh/obj/rl_state_function.o b/42sh/obj/rl_state_function.o new file mode 100644 index 00000000..05eca172 Binary files /dev/null and b/42sh/obj/rl_state_function.o differ diff --git a/42sh/obj/rl_word_move_function.o b/42sh/obj/rl_word_move_function.o new file mode 100644 index 00000000..6dc7d36a Binary files /dev/null and b/42sh/obj/rl_word_move_function.o differ diff --git a/42sh/obj/rl_word_utility.o b/42sh/obj/rl_word_utility.o new file mode 100644 index 00000000..b893a634 Binary files /dev/null and b/42sh/obj/rl_word_utility.o differ diff --git a/42sh/obj/rs_setup.o b/42sh/obj/rs_setup.o new file mode 100644 index 00000000..ad2715c7 Binary files /dev/null and b/42sh/obj/rs_setup.o differ diff --git a/42sh/obj/set_exitstatus.o b/42sh/obj/set_exitstatus.o new file mode 100644 index 00000000..5ead0e47 Binary files /dev/null and b/42sh/obj/set_exitstatus.o differ diff --git a/42sh/obj/shell_exit.o b/42sh/obj/shell_exit.o new file mode 100644 index 00000000..2135b2ba Binary files /dev/null and b/42sh/obj/shell_exit.o differ diff --git a/42sh/obj/shell_get_avdata.o b/42sh/obj/shell_get_avdata.o new file mode 100644 index 00000000..65b52ae7 Binary files /dev/null and b/42sh/obj/shell_get_avdata.o differ diff --git a/42sh/obj/shell_get_opts.o b/42sh/obj/shell_get_opts.o new file mode 100644 index 00000000..56453434 Binary files /dev/null and b/42sh/obj/shell_get_opts.o differ diff --git a/42sh/obj/shell_init.o b/42sh/obj/shell_init.o new file mode 100644 index 00000000..73af4f67 Binary files /dev/null and b/42sh/obj/shell_init.o differ diff --git a/42sh/obj/sigchld_handler.o b/42sh/obj/sigchld_handler.o new file mode 100644 index 00000000..d7e807d6 Binary files /dev/null and b/42sh/obj/sigchld_handler.o differ diff --git a/42sh/obj/sigint_handler.o b/42sh/obj/sigint_handler.o new file mode 100644 index 00000000..7e400cb0 Binary files /dev/null and b/42sh/obj/sigint_handler.o differ diff --git a/42sh/obj/sigtstp_handler.o b/42sh/obj/sigtstp_handler.o new file mode 100644 index 00000000..42aff638 Binary files /dev/null and b/42sh/obj/sigtstp_handler.o differ diff --git a/42sh/obj/sigttin_handler.o b/42sh/obj/sigttin_handler.o new file mode 100644 index 00000000..9944564f Binary files /dev/null and b/42sh/obj/sigttin_handler.o differ diff --git a/42sh/obj/sigttou_handler.o b/42sh/obj/sigttou_handler.o new file mode 100644 index 00000000..2db28422 Binary files /dev/null and b/42sh/obj/sigttou_handler.o differ diff --git a/42sh/obj/token_append.o b/42sh/obj/token_append.o new file mode 100644 index 00000000..fb2c0e5e Binary files /dev/null and b/42sh/obj/token_append.o differ diff --git a/42sh/obj/token_cmp_type.o b/42sh/obj/token_cmp_type.o new file mode 100644 index 00000000..b4fd101b Binary files /dev/null and b/42sh/obj/token_cmp_type.o differ diff --git a/42sh/obj/token_expand_var.o b/42sh/obj/token_expand_var.o new file mode 100644 index 00000000..bc14a0b1 Binary files /dev/null and b/42sh/obj/token_expand_var.o differ diff --git a/42sh/obj/token_free.o b/42sh/obj/token_free.o new file mode 100644 index 00000000..e001b021 Binary files /dev/null and b/42sh/obj/token_free.o differ diff --git a/42sh/obj/token_init.o b/42sh/obj/token_init.o new file mode 100644 index 00000000..0b21d8c0 Binary files /dev/null and b/42sh/obj/token_init.o differ diff --git a/42sh/obj/token_print.o b/42sh/obj/token_print.o new file mode 100644 index 00000000..76ca6e4a Binary files /dev/null and b/42sh/obj/token_print.o differ diff --git a/42sh/src/builtin/builtin_cd.c b/42sh/src/builtin/builtin_cd.c index b973bf53..6c84c1db 100644 --- a/42sh/src/builtin/builtin_cd.c +++ b/42sh/src/builtin/builtin_cd.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 11:57:53 by jhalford #+# #+# */ -/* Updated: 2017/01/11 14:29:14 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:10:52 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/builtin/builtin_echo.c b/42sh/src/builtin/builtin_echo.c index d044d7cf..f84c9123 100644 --- a/42sh/src/builtin/builtin_echo.c +++ b/42sh/src/builtin/builtin_echo.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:21:41 by jhalford #+# #+# */ -/* Updated: 2016/12/13 17:58:14 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:10:31 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/exec/exec_pipe.c b/42sh/src/exec/exec_pipe.c index 8e777ae1..6d9899f6 100644 --- a/42sh/src/exec/exec_pipe.c +++ b/42sh/src/exec/exec_pipe.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/27 21:13:23 by jhalford #+# #+# */ -/* Updated: 2017/01/09 16:19:38 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:17:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/exec/ft_exec.c b/42sh/src/exec/ft_exec.c index 2f18bdc8..b656db94 100644 --- a/42sh/src/exec/ft_exec.c +++ b/42sh/src/exec/ft_exec.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/27 20:30:32 by jhalford #+# #+# */ -/* Updated: 2017/01/11 18:01:05 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:56:51 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/exec/launch_process.c b/42sh/src/exec/launch_process.c index fb3a463a..9857891f 100644 --- a/42sh/src/exec/launch_process.c +++ b/42sh/src/exec/launch_process.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 14:20:45 by jhalford #+# #+# */ -/* Updated: 2017/01/11 18:01:10 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:12:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/job-control/builtin_bg.c b/42sh/src/job-control/builtin_bg.c index 1f34dcdb..d17ef2ed 100644 --- a/42sh/src/job-control/builtin_bg.c +++ b/42sh/src/job-control/builtin_bg.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/09 16:54:18 by jhalford #+# #+# */ -/* Updated: 2017/01/11 14:37:23 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:09:28 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/.ft_post_tokenize.c.swp b/42sh/src/lexer/.ft_post_tokenize.c.swp new file mode 100644 index 00000000..a6c9da13 Binary files /dev/null and b/42sh/src/lexer/.ft_post_tokenize.c.swp differ diff --git a/42sh/src/lexer/.ft_tokenize.c.swp b/42sh/src/lexer/.ft_tokenize.c.swp new file mode 100644 index 00000000..7dab1dd1 Binary files /dev/null and b/42sh/src/lexer/.ft_tokenize.c.swp differ diff --git a/42sh/src/lexer/.reduce_bquotes.c.swp b/42sh/src/lexer/.reduce_bquotes.c.swp new file mode 100644 index 00000000..1f2cadf3 Binary files /dev/null and b/42sh/src/lexer/.reduce_bquotes.c.swp differ diff --git a/42sh/src/lexer/command_getoutput.c b/42sh/src/lexer/command_getoutput.c index 44b6c2e4..da7bdd2a 100644 --- a/42sh/src/lexer/command_getoutput.c +++ b/42sh/src/lexer/command_getoutput.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/12 14:01:59 by jhalford #+# #+# */ -/* Updated: 2017/01/12 15:31:34 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:31:42 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/ft_post_tokenize.c b/42sh/src/lexer/ft_post_tokenize.c index a3de30d2..23367fcf 100644 --- a/42sh/src/lexer/ft_post_tokenize.c +++ b/42sh/src/lexer/ft_post_tokenize.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:11:11 by jhalford #+# #+# */ -/* Updated: 2017/01/12 13:58:20 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:37:25 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/ft_tokenize.c b/42sh/src/lexer/ft_tokenize.c index 3955993f..a75170dc 100644 --- a/42sh/src/lexer/ft_tokenize.c +++ b/42sh/src/lexer/ft_tokenize.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 13:37:11 by jhalford #+# #+# */ -/* Updated: 2017/01/11 16:11:02 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 20:49:42 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/get_lexer_state.c b/42sh/src/lexer/get_lexer_state.c index 37ae772b..4a35438f 100644 --- a/42sh/src/lexer/get_lexer_state.c +++ b/42sh/src/lexer/get_lexer_state.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/10 13:45:46 by jhalford #+# #+# */ -/* Updated: 2017/01/11 15:48:13 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:46:48 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/lexer_backslash.c b/42sh/src/lexer/lexer_backslash.c index 9a6f2438..b1a6c908 100644 --- a/42sh/src/lexer/lexer_backslash.c +++ b/42sh/src/lexer/lexer_backslash.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 11:56:49 by jhalford #+# #+# */ -/* Updated: 2016/12/03 12:35:13 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 22:06:43 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/lexer_default.c b/42sh/src/lexer/lexer_default.c index 04c87fca..2dc52117 100644 --- a/42sh/src/lexer/lexer_default.c +++ b/42sh/src/lexer/lexer_default.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 18:36:21 by jhalford #+# #+# */ -/* Updated: 2017/01/11 16:10:53 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:58:36 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/lexer_dquote.c b/42sh/src/lexer/lexer_dquote.c index d5c1b2e3..35485a56 100644 --- a/42sh/src/lexer/lexer_dquote.c +++ b/42sh/src/lexer/lexer_dquote.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */ -/* Updated: 2017/01/10 15:15:24 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 22:04:11 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/reduce_bquotes.c b/42sh/src/lexer/reduce_bquotes.c index 5198a2f2..6057e8c0 100644 --- a/42sh/src/lexer/reduce_bquotes.c +++ b/42sh/src/lexer/reduce_bquotes.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:46:27 by jhalford #+# #+# */ -/* Updated: 2017/01/12 15:10:16 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 01:14:32 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -49,4 +49,3 @@ int reduce_bquotes(t_list **alst, char **str) } return (0); } - diff --git a/42sh/src/lexer/reduce_parens.c b/42sh/src/lexer/reduce_parens.c index dfad6686..175c1dd6 100644 --- a/42sh/src/lexer/reduce_parens.c +++ b/42sh/src/lexer/reduce_parens.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:13:31 by jhalford #+# #+# */ -/* Updated: 2017/01/12 13:50:10 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 18:26:53 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/token_append.c b/42sh/src/lexer/token_append.c index c08e5c5a..250574e3 100644 --- a/42sh/src/lexer/token_append.c +++ b/42sh/src/lexer/token_append.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/11 17:18:42 by jhalford #+# #+# */ -/* Updated: 2016/11/11 17:47:15 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:01:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/token_cmp_type.c b/42sh/src/lexer/token_cmp_type.c index 08f3ab87..69c90510 100644 --- a/42sh/src/lexer/token_cmp_type.c +++ b/42sh/src/lexer/token_cmp_type.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/30 17:08:55 by jhalford #+# #+# */ -/* Updated: 2016/12/05 13:35:53 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:12:09 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/token_init.c b/42sh/src/lexer/token_init.c index cf9fe1b7..7f55464f 100644 --- a/42sh/src/lexer/token_init.c +++ b/42sh/src/lexer/token_init.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 15:30:25 by jhalford #+# #+# */ -/* Updated: 2017/01/11 15:45:10 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:58:47 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/token_print.c b/42sh/src/lexer/token_print.c index 97876ddb..9453a0cd 100644 --- a/42sh/src/lexer/token_print.c +++ b/42sh/src/lexer/token_print.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:39:01 by jhalford #+# #+# */ -/* Updated: 2017/01/12 14:48:33 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 23:44:34 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_ask.c b/42sh/src/line-editing/curs_ask.c index e465b8c7..62634544 100644 --- a/42sh/src/line-editing/curs_ask.c +++ b/42sh/src/line-editing/curs_ask.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:03:49 by sbenning #+# #+# */ -/* Updated: 2016/12/09 16:47:13 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:22:36 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_clear.c b/42sh/src/line-editing/curs_clear.c index cb3d0694..a76809ab 100644 --- a/42sh/src/line-editing/curs_clear.c +++ b/42sh/src/line-editing/curs_clear.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:28:50 by sbenning #+# #+# */ -/* Updated: 2017/01/10 17:20:41 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:22:46 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_goto.c b/42sh/src/line-editing/curs_goto.c index 389c982d..451be308 100644 --- a/42sh/src/line-editing/curs_goto.c +++ b/42sh/src/line-editing/curs_goto.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:10:22 by sbenning #+# #+# */ -/* Updated: 2016/12/09 16:58:26 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:22:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_move.c b/42sh/src/line-editing/curs_move.c index d96d0ec1..18373634 100644 --- a/42sh/src/line-editing/curs_move.c +++ b/42sh/src/line-editing/curs_move.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:21:08 by sbenning #+# #+# */ -/* Updated: 2016/12/09 16:56:41 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:23:09 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_setup.c b/42sh/src/line-editing/curs_setup.c index c9842a54..5c43b795 100644 --- a/42sh/src/line-editing/curs_setup.c +++ b/42sh/src/line-editing/curs_setup.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 16:36:43 by sbenning #+# #+# */ -/* Updated: 2017/01/11 13:55:42 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:23:21 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_single.c b/42sh/src/line-editing/curs_single.c index a7c883a9..5d233d62 100644 --- a/42sh/src/line-editing/curs_single.c +++ b/42sh/src/line-editing/curs_single.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:04:53 by sbenning #+# #+# */ -/* Updated: 2016/12/09 16:40:41 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:23:28 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_term_setup.c b/42sh/src/line-editing/curs_term_setup.c index 9a18bc72..8bd5eeaa 100644 --- a/42sh/src/line-editing/curs_term_setup.c +++ b/42sh/src/line-editing/curs_term_setup.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 16:50:26 by sbenning #+# #+# */ -/* Updated: 2017/01/11 13:55:40 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:23:38 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/curs_write.c b/42sh/src/line-editing/curs_write.c index efe19c72..c9e4297a 100644 --- a/42sh/src/line-editing/curs_write.c +++ b/42sh/src/line-editing/curs_write.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 17:52:20 by sbenning #+# #+# */ -/* Updated: 2016/12/09 17:03:41 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:25:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/ft_readline.c b/42sh/src/line-editing/ft_readline.c index 90620a39..85b96e20 100644 --- a/42sh/src/line-editing/ft_readline.c +++ b/42sh/src/line-editing/ft_readline.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:03:48 by sbenning #+# #+# */ -/* Updated: 2017/01/11 17:35:14 by jhalford ### ########.fr */ +/* Updated: 2017/01/22 00:37:17 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_bitset.c b/42sh/src/line-editing/rl_bitset.c index 60190f51..1c909e4a 100644 --- a/42sh/src/line-editing/rl_bitset.c +++ b/42sh/src/line-editing/rl_bitset.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 10:31:34 by sbenning #+# #+# */ -/* Updated: 2016/12/12 13:26:06 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:35:46 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_clear_function.c b/42sh/src/line-editing/rl_clear_function.c index 6782b79c..02305b2d 100644 --- a/42sh/src/line-editing/rl_clear_function.c +++ b/42sh/src/line-editing/rl_clear_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 13:34:29 by sbenning #+# #+# */ -/* Updated: 2017/01/10 17:46:00 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:36:01 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_clipboard_function.c b/42sh/src/line-editing/rl_clipboard_function.c index 5b884d97..a5c93532 100644 --- a/42sh/src/line-editing/rl_clipboard_function.c +++ b/42sh/src/line-editing/rl_clipboard_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:32:11 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:34:12 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:36:10 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_clipboard_utility.c b/42sh/src/line-editing/rl_clipboard_utility.c index 86b1987e..5a7a595c 100644 --- a/42sh/src/line-editing/rl_clipboard_utility.c +++ b/42sh/src/line-editing/rl_clipboard_utility.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 14:04:33 by sbenning #+# #+# */ -/* Updated: 2016/12/09 15:57:47 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:36:27 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_comp_function.c b/42sh/src/line-editing/rl_comp_function.c index dd1d9729..b4d0927a 100644 --- a/42sh/src/line-editing/rl_comp_function.c +++ b/42sh/src/line-editing/rl_comp_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 10:49:03 by sbenning #+# #+# */ -/* Updated: 2017/01/10 11:51:19 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:36:49 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_default_function.c b/42sh/src/line-editing/rl_default_function.c index 5c953981..bb1bd721 100644 --- a/42sh/src/line-editing/rl_default_function.c +++ b/42sh/src/line-editing/rl_default_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:30:38 by sbenning #+# #+# */ -/* Updated: 2016/12/12 11:50:26 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:37:02 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_display.c b/42sh/src/line-editing/rl_display.c index 26f787f5..3524d155 100644 --- a/42sh/src/line-editing/rl_display.c +++ b/42sh/src/line-editing/rl_display.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:38:39 by sbenning #+# #+# */ -/* Updated: 2016/12/10 11:52:18 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:37:29 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_dynamic_buffer.c b/42sh/src/line-editing/rl_dynamic_buffer.c index d6f1a673..932db10b 100644 --- a/42sh/src/line-editing/rl_dynamic_buffer.c +++ b/42sh/src/line-editing/rl_dynamic_buffer.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:42:31 by sbenning #+# #+# */ -/* Updated: 2016/12/12 10:28:59 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:41:19 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_long_move_function.c b/42sh/src/line-editing/rl_long_move_function.c index 5769b90e..a54f6859 100644 --- a/42sh/src/line-editing/rl_long_move_function.c +++ b/42sh/src/line-editing/rl_long_move_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:55:48 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:57:16 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:34:02 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_merge_line.c b/42sh/src/line-editing/rl_merge_line.c index ed0b0ea3..50ee04af 100644 --- a/42sh/src/line-editing/rl_merge_line.c +++ b/42sh/src/line-editing/rl_merge_line.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 01:25:03 by sbenning #+# #+# */ -/* Updated: 2016/12/12 11:34:02 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:34:25 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_page_move_function.c b/42sh/src/line-editing/rl_page_move_function.c index efd20d87..1995f6ca 100644 --- a/42sh/src/line-editing/rl_page_move_function.c +++ b/42sh/src/line-editing/rl_page_move_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:39:57 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:42:37 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:37:41 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_prompt.c b/42sh/src/line-editing/rl_prompt.c index 3dc9e4f0..30fb6240 100644 --- a/42sh/src/line-editing/rl_prompt.c +++ b/42sh/src/line-editing/rl_prompt.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 01:45:09 by sbenning #+# #+# */ -/* Updated: 2017/01/10 16:41:28 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:51:50 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_quoting_function.c b/42sh/src/line-editing/rl_quoting_function.c index 57ce891e..06384194 100644 --- a/42sh/src/line-editing/rl_quoting_function.c +++ b/42sh/src/line-editing/rl_quoting_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:35:25 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:36:41 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:38:02 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_remove_function.c b/42sh/src/line-editing/rl_remove_function.c index feeab949..a4bdf334 100644 --- a/42sh/src/line-editing/rl_remove_function.c +++ b/42sh/src/line-editing/rl_remove_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:45:08 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:46:39 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:38:14 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_setup.c b/42sh/src/line-editing/rl_setup.c index 3e68d63a..ead0b93e 100644 --- a/42sh/src/line-editing/rl_setup.c +++ b/42sh/src/line-editing/rl_setup.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:07:47 by sbenning #+# #+# */ -/* Updated: 2017/01/11 17:35:12 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 23:27:14 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_short_move_function.c b/42sh/src/line-editing/rl_short_move_function.c index 8399cf19..7dc5196b 100644 --- a/42sh/src/line-editing/rl_short_move_function.c +++ b/42sh/src/line-editing/rl_short_move_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:53:18 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:54:52 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:38:52 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_stack_line.c b/42sh/src/line-editing/rl_stack_line.c index 3e1a538b..0824fb11 100644 --- a/42sh/src/line-editing/rl_stack_line.c +++ b/42sh/src/line-editing/rl_stack_line.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 01:06:54 by sbenning #+# #+# */ -/* Updated: 2017/01/10 13:07:37 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:39:22 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_state_function.c b/42sh/src/line-editing/rl_state_function.c index 200961d8..c7deca62 100644 --- a/42sh/src/line-editing/rl_state_function.c +++ b/42sh/src/line-editing/rl_state_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 13:00:59 by sbenning #+# #+# */ -/* Updated: 2016/12/12 13:01:51 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:39:31 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_word_move_function.c b/42sh/src/line-editing/rl_word_move_function.c index 205d9046..de976fa4 100644 --- a/42sh/src/line-editing/rl_word_move_function.c +++ b/42sh/src/line-editing/rl_word_move_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:47:31 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:51:53 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:39:44 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/line-editing/rl_word_utility.c b/42sh/src/line-editing/rl_word_utility.c index 46010b9f..343a6ecf 100644 --- a/42sh/src/line-editing/rl_word_utility.c +++ b/42sh/src/line-editing/rl_word_utility.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 12:48:07 by sbenning #+# #+# */ -/* Updated: 2016/12/12 12:50:44 by sbenning ### ########.fr */ +/* Updated: 2017/01/21 22:39:55 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/.main.c.swp b/42sh/src/main/.main.c.swp new file mode 100644 index 00000000..cb0bbd5e Binary files /dev/null and b/42sh/src/main/.main.c.swp differ diff --git a/42sh/src/main/data_exit.c b/42sh/src/main/data_exit.c index e22c741d..e7eb4c74 100644 --- a/42sh/src/main/data_exit.c +++ b/42sh/src/main/data_exit.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/07 18:07:50 by jhalford #+# #+# */ -/* Updated: 2017/01/10 13:16:38 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 21:06:33 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/data_init.c b/42sh/src/main/data_init.c index 1829cbd1..c303d707 100644 --- a/42sh/src/main/data_init.c +++ b/42sh/src/main/data_init.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 19:26:32 by jhalford #+# #+# */ -/* Updated: 2017/01/11 14:03:16 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 23:28:31 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/data_singleton.c b/42sh/src/main/data_singleton.c index 33d75a04..c215e7f9 100644 --- a/42sh/src/main/data_singleton.c +++ b/42sh/src/main/data_singleton.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/10 11:36:39 by jhalford #+# #+# */ -/* Updated: 2017/01/10 11:47:11 by jhalford ### ########.fr */ +/* Updated: 2017/01/22 00:37:13 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index 27e00034..cd8b64f7 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ -/* Updated: 2017/01/12 14:02:30 by jhalford ### ########.fr */ +/* Updated: 2017/01/22 00:37:15 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,14 +26,13 @@ int shell_single_command(char *command) return (1); if (!token) return (0); - token_print(token); if (ft_post_tokenize(&token, command)) return (1); DG("after post_tokenize"); token_print(token); if (ft_parse(&ast, &token)) return (1); - /* btree_print(STDBUG, ast, &ft_putast); */ + btree_print(STDBUG, ast, &ft_putast); /* /1* ft_dprintf(STDBUG, "\n--- INFIX BREAKDOWN ---\n"); *1/ */ /* /1* btree_apply_infix(ast, &ft_putast2); *1/ */ if (ft_exec(&ast)) @@ -51,11 +50,13 @@ int main(int ac, char **av) return (0); } while (1) - { - if (ft_readline()) - return (1); - if (shell_single_command(data_singleton()->line.input)) - return (1); + { +// if (ft_read_script()) +// return (1); +// else if (ft_readline()) +// return (1); +// if (shell_single_command(data_singleton()->line.input)) +// return (1); } return (0); } diff --git a/42sh/src/main/shell_exit.c b/42sh/src/main/shell_exit.c index 0983fa88..83e4becc 100644 --- a/42sh/src/main/shell_exit.c +++ b/42sh/src/main/shell_exit.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 17:37:04 by jhalford #+# #+# */ -/* Updated: 2017/01/10 16:51:45 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 21:50:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/shell_get_avdata.c b/42sh/src/main/shell_get_avdata.c index eecb524c..6194cbf3 100644 --- a/42sh/src/main/shell_get_avdata.c +++ b/42sh/src/main/shell_get_avdata.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 17:14:52 by jhalford #+# #+# */ -/* Updated: 2017/01/11 17:26:32 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 20:56:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/shell_get_opts.c b/42sh/src/main/shell_get_opts.c index d91fce50..04fb5a22 100644 --- a/42sh/src/main/shell_get_opts.c +++ b/42sh/src/main/shell_get_opts.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 14:04:48 by jhalford #+# #+# */ -/* Updated: 2017/01/11 17:14:35 by jhalford ### ########.fr */ +/* Updated: 2017/01/19 21:23:17 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/main/shell_init.c b/42sh/src/main/shell_init.c index b540d564..461d8736 100644 --- a/42sh/src/main/shell_init.c +++ b/42sh/src/main/shell_init.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */ -/* Updated: 2017/01/11 17:07:38 by jhalford ### ########.fr */ +/* Updated: 2017/01/21 22:02:05 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/.ft_parse.c.swp b/42sh/src/parser/.ft_parse.c.swp new file mode 100644 index 00000000..5596bf6a Binary files /dev/null and b/42sh/src/parser/.ft_parse.c.swp differ diff --git a/42sh/src/parser/.parse_word.c.swp b/42sh/src/parser/.parse_word.c.swp new file mode 100644 index 00000000..9e721f92 Binary files /dev/null and b/42sh/src/parser/.parse_word.c.swp differ diff --git a/42sh/src/parser/ft_parse.c b/42sh/src/parser/ft_parse.c index 2dbdbb5d..805fbfe6 100644 --- a/42sh/src/parser/ft_parse.c +++ b/42sh/src/parser/ft_parse.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/30 17:14:58 by jhalford #+# #+# */ -/* Updated: 2017/01/12 15:07:31 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:37:29 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_dgreat.c b/42sh/src/parser/parse_dgreat.c index 15d7b579..8cd643fd 100644 --- a/42sh/src/parser/parse_dgreat.c +++ b/42sh/src/parser/parse_dgreat.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2017/01/10 14:44:12 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:23:07 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_dless.c b/42sh/src/parser/parse_dless.c index a1970bbb..f0a4ba45 100644 --- a/42sh/src/parser/parse_dless.c +++ b/42sh/src/parser/parse_dless.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/03 13:31:40 by jhalford #+# #+# */ -/* Updated: 2016/12/03 13:31:41 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:23:17 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_great.c b/42sh/src/parser/parse_great.c index 490965dc..6350fd9f 100644 --- a/42sh/src/parser/parse_great.c +++ b/42sh/src/parser/parse_great.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2017/01/10 14:45:50 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:23:53 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_greatand.c b/42sh/src/parser/parse_greatand.c index b4d6f657..b607415d 100644 --- a/42sh/src/parser/parse_greatand.c +++ b/42sh/src/parser/parse_greatand.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2016/12/01 16:37:58 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:24:04 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_less.c b/42sh/src/parser/parse_less.c index b1da5d1f..9f97c55a 100644 --- a/42sh/src/parser/parse_less.c +++ b/42sh/src/parser/parse_less.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2016/12/05 11:58:48 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:24:11 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_lessand.c b/42sh/src/parser/parse_lessand.c index 8f5b0b9b..3aa80e6c 100644 --- a/42sh/src/parser/parse_lessand.c +++ b/42sh/src/parser/parse_lessand.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2016/12/01 16:37:54 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:24:37 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_separator.c b/42sh/src/parser/parse_separator.c index dc35483e..7f00ee86 100644 --- a/42sh/src/parser/parse_separator.c +++ b/42sh/src/parser/parse_separator.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 16:21:51 by jhalford #+# #+# */ -/* Updated: 2016/12/03 13:32:14 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:24:51 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_subshell.c b/42sh/src/parser/parse_subshell.c index bcb38158..9f6137eb 100644 --- a/42sh/src/parser/parse_subshell.c +++ b/42sh/src/parser/parse_subshell.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/11 16:52:44 by jhalford #+# #+# */ -/* Updated: 2017/01/12 15:10:24 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 16:25:08 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/parser/parse_word.c b/42sh/src/parser/parse_word.c index 45c64039..28ccb098 100644 --- a/42sh/src/parser/parse_word.c +++ b/42sh/src/parser/parse_word.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/14 12:49:45 by jhalford #+# #+# */ -/* Updated: 2017/01/11 17:24:55 by jhalford ### ########.fr */ +/* Updated: 2017/01/20 00:07:56 by ariard ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/read-script/ft_read_script.c b/42sh/src/read-script/ft_read_script.c new file mode 100644 index 00000000..71bbc46b --- /dev/null +++ b/42sh/src/read-script/ft_read_script.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_read_script.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ariard +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2017/01/21 22:49:31 by ariard #+# #+# */ +/* Updated: 2017/01/22 00:33:09 by ariard ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +int ft_read_script() +{ + t_script *script; + + script = &data_singleton()->script; + if (rs_setup(script) < 0) + return (-1); +// if (rs_loop(script) < 0) +// return (-1); + return (0); +} diff --git a/42sh/src/read-script/rs_setup.c b/42sh/src/read-script/rs_setup.c new file mode 100644 index 00000000..4d735c14 --- /dev/null +++ b/42sh/src/read-script/rs_setup.c @@ -0,0 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* rs_setup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: ariard +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2017/01/21 23:08:04 by ariard #+# #+# */ +/* Updated: 2017/01/22 00:33:27 by ariard ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +int rs_setup(t_script *script) +{ + ft_bzero(script, sizeof(script)); + script->buffer = 0; + script->b_size = 0; + script->used = 0; + script->q_size = 0; + return (0); +}