From b52db9b55fd30a5751d900a242784ce07361b610 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Sat, 25 Mar 2017 23:31:12 +0100 Subject: [PATCH] compile --- 42sh/Makefile | 470 +++++++++++++++++++++----------------------------- 1 file changed, 200 insertions(+), 270 deletions(-) diff --git a/42sh/Makefile b/42sh/Makefile index 5ca44678..2a2c7a0e 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -13,7 +13,7 @@ NAME = minishell CC = gcc -FLAGS = -Wall -Wextra -Werror -fsanitize=address#-fvisibility=hidden +FLAGS = -Wall -Wextra -Werror D_FLAGS = -g DELTA = $$(echo "$$(tput cols)-47"|bc) @@ -29,206 +29,222 @@ INC_DIR = includes/ OBJ_DIR = objs/ SRC_BASE = \ -completion/c_pathsolver.c\ -completion/c_init.c\ -completion/c_printer.c\ +builtin/bt_env_opt.c\ +builtin/bt_read_get.c\ +builtin/bt_read_term.c\ +builtin/builtin_cd.c\ +builtin/builtin_echo.c\ +builtin/builtin_env.c\ +builtin/builtin_exit.c\ +builtin/builtin_export.c\ +builtin/builtin_func.c\ +builtin/builtin_hash.c\ +builtin/builtin_history.c\ +builtin/builtin_math.c\ +builtin/builtin_read.c\ +builtin/builtin_setenv.c\ +builtin/builtin_unset.c\ +builtin/builtin_unsetenv.c\ +builtin/is_builtin.c\ +completion/c_arrow.c\ +completion/c_clear.c\ +completion/c_find_abspath.c\ completion/c_find_binary.c\ completion/c_find_env.c\ -completion/c_clear.c\ -completion/c_parser.c\ -completion/c_arrow.c\ -completion/c_sizing.c\ -completion/completion.c\ -completion/c_match_glob.c\ completion/c_find_files.c\ -completion/c_terminal.c\ -completion/c_output.c\ -completion/c_misc.c\ +completion/c_init.c\ completion/c_match.c\ +completion/c_match_glob.c\ completion/c_match_update.c\ -completion/c_find_abspath.c\ -history/surch_in_history.c\ -history/history_parsing_toolz_2.c\ -history/history_parsing_toolz.c\ -history/list_toolz.c\ -history/add_str_in_history.c\ -history/history_parsing.c\ -history/history.c\ -job_control/pprint_while.c\ -job_control/mark_job_as_running.c\ -job_control/pprint_case.c\ -job_control/job_notify_new.c\ -job_control/sigint_handler.c\ -job_control/job_update_status.c\ -job_control/job_format_head.c\ -job_control/job_is_completed.c\ -job_control/job_wait.c\ -job_control/sigtstp_handler.c\ -job_control/job_free.c\ -job_control/pprint_for.c\ -job_control/pprint_if.c\ -job_control/job_hup_all.c\ -job_control/put_job_in_foreground.c\ -job_control/job_is_stopped.c\ -job_control/process_free.c\ -job_control/sigttin_handler.c\ -job_control/sigttou_handler.c\ -job_control/builtin_jobs.c\ -job_control/process_cmp_pid.c\ -job_control/pprint_subshell.c\ -job_control/job_remove.c\ -job_control/builtin_bg.c\ -job_control/job_run.c\ -job_control/has_stopped_job.c\ -job_control/pprint_cmd.c\ -job_control/job_cmp_id.c\ -job_control/pprint_brace.c\ -job_control/job_addprocess.c\ -job_control/job_update_id.c\ -job_control/do_job_notification.c\ -job_control/job_getrank.c\ -job_control/has_running_job.c\ -job_control/process_format.c\ -job_control/job_getprocess.c\ -job_control/job_notify_change.c\ -job_control/job_format.c\ -job_control/put_job_in_background.c\ -job_control/pprint_until.c\ -job_control/pprint_function.c\ -job_control/builtin_fg.c\ -job_control/sigchld_handler.c\ -parser/tree_func_free.c\ -parser/parser_destroy.c\ -parser/tree_wrapper.c\ -parser/pop_stack.c\ -parser/add_cmd.c\ -parser/parser_init.c\ -parser/aggregate_sym.c\ -parser/redir_init.c\ -parser/do_parser_routine.c\ -parser/stack_init.c\ -parser/add_number.c\ -parser/add_func.c\ -parser/add_loop.c\ -parser/read_stack.c\ -parser/push_stack.c\ -parser/add_sep.c\ -parser/ft_parse.c\ -parser/add_condition.c\ -parser/produce_sym.c\ -parser/heredoc_parser.c\ -parser/add_case.c\ -parser/sym_free.c\ -parser/add_subshell.c\ -parser/build_tree.c\ -parser/eval_sym.c\ -parser/error_syntax.c\ -parser/add_bang.c\ -parser/add_redir.c\ -main/data_exit.c\ -main/ft_putast.c\ -main/main.c\ -main/shell_reset.c\ -main/data_singleton.c\ -main/data_init.c\ -main/shell_init.c\ -line_editing/lib_line_editing/toolz_termcaps.c\ -line_editing/lib_line_editing/tool_line_2.c\ -line_editing/lib_line_editing/tool_line.c\ -line_editing/lib_line_editing/toolz.c\ -line_editing/lib_line_editing/toolz_parseur.c\ -line_editing/lib_line_editing/ft_nb_line.c\ -line_editing/lib_line_editing/toolz2.c\ -line_editing/resize.c\ -line_editing/control_features.c\ -line_editing/print_del_completion/queue.c\ -line_editing/print_del_completion/completion.c\ -line_editing/print_del_completion/print_and_del.c\ -line_editing/get_key.c\ -line_editing/ft_prompt.c\ -line_editing/readline.c\ -line_editing/move_term/move_up_and_down.c\ -line_editing/move_term/home_end.c\ -line_editing/move_term/move_to_word.c\ -line_editing/move_term/move_left_and_right.c\ -line_editing/init_line/init_termcaps.c\ -line_editing/init_line/init_history.c\ -line_editing/init_line/init_line.c\ -line_editing/copy_cut_paste/underline_home.c\ -line_editing/copy_cut_paste/underline_down.c\ -line_editing/copy_cut_paste/underline_end.c\ -line_editing/copy_cut_paste/underline_reset.c\ -line_editing/copy_cut_paste/underline_function.c\ -line_editing/copy_cut_paste/copy_cut_paste.c\ -line_editing/copy_cut_paste/underline_right.c\ -line_editing/copy_cut_paste/underline_up.c\ -line_editing/copy_cut_paste/underline_left.c\ -glob/expand_home.c\ -glob/expand_bquote.c\ +completion/c_misc.c\ +completion/c_output.c\ +completion/c_parser.c\ +completion/c_pathsolver.c\ +completion/c_printer.c\ +completion/c_sizing.c\ +completion/c_terminal.c\ +completion/completion.c\ +exec/ast_free.c\ +exec/bad_fd.c\ +exec/exec_ampersand.c\ +exec/exec_and_if.c\ +exec/exec_bang.c\ +exec/exec_case_branch.c\ +exec/exec_elif.c\ +exec/exec_else.c\ +exec/exec_func.c\ +exec/exec_leaf.c\ +exec/exec_or_if.c\ +exec/exec_pipe.c\ +exec/exec_reset.c\ +exec/exec_semi.c\ +exec/exec_var.c\ +exec/fd_is_valid.c\ +exec/ft_exec.c\ +exec/ft_findexec.c\ +exec/is_function.c\ +exec/mark_process_status.c\ +exec/node_copy.c\ +exec/pfree_cmd.c\ +exec/pfree_cond.c\ +exec/pfree_func.c\ +exec/pfree_list.c\ +exec/pfree_subshell.c\ +exec/plaunch_brace.c\ +exec/plaunch_builtin.c\ +exec/plaunch_case.c\ +exec/plaunch_empty.c\ +exec/plaunch_file.c\ +exec/plaunch_for.c\ +exec/plaunch_function.c\ +exec/plaunch_if.c\ +exec/plaunch_subshell.c\ +exec/plaunch_until.c\ +exec/plaunch_while.c\ +exec/process_launch.c\ +exec/process_redirect.c\ +exec/process_set.c\ +exec/process_setgroup.c\ +exec/process_setsig.c\ +exec/pset_brace.c\ +exec/pset_case.c\ +exec/pset_cmd.c\ +exec/pset_for.c\ +exec/pset_if.c\ +exec/pset_subshell.c\ +exec/pset_until.c\ +exec/pset_while.c\ +exec/redir_copy.c\ +exec/redir_free.c\ +exec/redirect_dgreat.c\ +exec/redirect_dless.c\ +exec/redirect_great.c\ +exec/redirect_greatand.c\ +exec/redirect_less.c\ +exec/redirect_lessand.c\ +exec/set_exitstatus.c\ +exec/token_to_argv.c\ +glob/command_getoutput.c\ glob/dir_glob.c\ -glob/ft_strsplit_esc.c\ +glob/esc_print.c\ +glob/expand_bquote.c\ +glob/expand_brace.c\ +glob/expand_esc.c\ +glob/expand_home.c\ glob/expand_var.c\ +glob/ft_strsplit_esc.c\ +glob/ft_strsplit_spe.c\ +glob/gen_tab_esc.c\ glob/glob.c\ -glob/word_is_assignment.c\ -glob/match_pattern.c\ +glob/is_char_esc.c\ +glob/lib_perso/ft_ld_back.c\ +glob/lib_perso/ft_ld_clear.c\ +glob/lib_perso/ft_ld_copy.c\ +glob/lib_perso/ft_ld_del.c\ glob/lib_perso/ft_ld_front.c\ glob/lib_perso/ft_ld_new.c\ -glob/lib_perso/ft_ld_size.c\ -glob/lib_perso/ft_tablen.c\ -glob/lib_perso/ft_ld_pushfront.c\ -glob/lib_perso/ft_ld_swap.c\ glob/lib_perso/ft_ld_order.c\ -glob/lib_perso/ft_strsubf.c\ -glob/lib_perso/ft_ld_reverse.c\ -glob/lib_perso/ft_ld_to_tab.c\ -glob/lib_perso/ft_tabdel.c\ -glob/lib_perso/ft_strjoinf.c\ -glob/lib_perso/ft_ld_del.c\ -glob/lib_perso/ft_ld_back.c\ -glob/lib_perso/ft_memrealloc.c\ -glob/lib_perso/ft_ld_copy.c\ glob/lib_perso/ft_ld_pushback.c\ -glob/lib_perso/ft_ld_clear.c\ -glob/expand_brace.c\ +glob/lib_perso/ft_ld_pushfront.c\ +glob/lib_perso/ft_ld_reverse.c\ +glob/lib_perso/ft_ld_size.c\ +glob/lib_perso/ft_ld_swap.c\ +glob/lib_perso/ft_ld_to_tab.c\ +glob/lib_perso/ft_memrealloc.c\ +glob/lib_perso/ft_strjoinf.c\ +glob/lib_perso/ft_strsubf.c\ +glob/lib_perso/ft_tabdel.c\ +glob/lib_perso/ft_tablen.c\ +glob/match_pattern.c\ glob/tab_esc_copy.c\ -glob/ft_strsplit_spe.c\ -glob/esc_print.c\ -glob/expand_esc.c\ -glob/is_char_esc.c\ -glob/command_getoutput.c\ -glob/gen_tab_esc.c\ -lexer/lexer_delim.c\ -lexer/lexer_paren.c\ -lexer/get_state_redir.c\ -lexer/lexer_quote.c\ -lexer/lexer_dquote.c\ -lexer/token_free.c\ -lexer/token_cmp_type.c\ -lexer/lexer_sep.c\ -lexer/lexer_heredoc.c\ -lexer/token_init.c\ -lexer/lexer_less.c\ -lexer/insert_newline.c\ -lexer/get_lexer_stack2.c\ -lexer/lexer_init.c\ -lexer/keep_last_type.c\ -lexer/isrw_delim.c\ -lexer/lexer_lex.c\ -lexer/lexer_destroy.c\ -lexer/lexer_word.c\ -lexer/lexer_newline.c\ -lexer/get_lexer_stack.c\ -lexer/lexer_great.c\ -lexer/lexer_curly_braces.c\ -lexer/lexer_end.c\ -lexer/get_reserved_words.c\ +glob/word_is_assignment.c\ +hash_table/ft_add_hash.c\ +hash_table/hash.c\ +hash_table/hash_free.c\ +hash_table/hash_str.c\ +hash_table/is_hash.c\ +history/add_str_in_history.c\ +history/history.c\ +history/history_parsing.c\ +history/history_parsing_toolz.c\ +history/history_parsing_toolz_2.c\ +history/list_toolz.c\ +history/surch_in_history.c\ +job_control/builtin_bg.c\ +job_control/builtin_fg.c\ +job_control/builtin_jobs.c\ +job_control/do_job_notification.c\ +job_control/has_running_job.c\ +job_control/has_stopped_job.c\ +job_control/job_addprocess.c\ +job_control/job_cmp_id.c\ +job_control/job_format.c\ +job_control/job_format_head.c\ +job_control/job_free.c\ +job_control/job_getprocess.c\ +job_control/job_getrank.c\ +job_control/job_hup_all.c\ +job_control/job_is_completed.c\ +job_control/job_is_stopped.c\ +job_control/job_notify_change.c\ +job_control/job_notify_new.c\ +job_control/job_remove.c\ +job_control/job_run.c\ +job_control/job_update_id.c\ +job_control/job_update_status.c\ +job_control/job_wait.c\ +job_control/mark_job_as_running.c\ +job_control/pprint_brace.c\ +job_control/pprint_case.c\ +job_control/pprint_cmd.c\ +job_control/pprint_for.c\ +job_control/pprint_function.c\ +job_control/pprint_if.c\ +job_control/pprint_subshell.c\ +job_control/pprint_until.c\ +job_control/pprint_while.c\ +job_control/process_cmp_pid.c\ +job_control/process_format.c\ +job_control/process_free.c\ +job_control/put_job_in_background.c\ +job_control/put_job_in_foreground.c\ +job_control/sigchld_handler.c\ +job_control/sigint_handler.c\ +job_control/sigtstp_handler.c\ +job_control/sigttin_handler.c\ +job_control/sigttou_handler.c\ lexer/do_lexer_routine.c\ -lexer/token_append.c\ +lexer/get_lexer_stack.c\ +lexer/get_lexer_stack2.c\ +lexer/get_reserved_words.c\ lexer/get_state_global.c\ +lexer/get_state_redir.c\ +lexer/insert_newline.c\ +lexer/isrw_delim.c\ +lexer/keep_last_type.c\ +lexer/lexer_backslash.c\ lexer/lexer_bquote.c\ +lexer/lexer_curly_braces.c\ lexer/lexer_default.c\ -lexer/token_print.c\ -<<<<<<< HEAD +lexer/lexer_delim.c\ +lexer/lexer_destroy.c\ +lexer/lexer_dquote.c\ +lexer/lexer_end.c\ +lexer/lexer_great.c\ +lexer/lexer_heredoc.c\ +lexer/lexer_init.c\ +lexer/lexer_less.c\ +lexer/lexer_lex.c\ +lexer/lexer_newline.c\ +lexer/lexer_number.c\ +lexer/lexer_paren.c\ +lexer/lexer_quote.c\ +lexer/lexer_sep.c\ +lexer/lexer_word.c\ +lexer/token_append.c\ +lexer/token_cmp_type.c\ +lexer/token_free.c\ +lexer/token_init.c\ line_editing/control_features.c\ line_editing/copy_cut_paste/copy_cut_paste.c\ line_editing/copy_cut_paste/underline_down.c\ @@ -293,92 +309,6 @@ parser/stack_init.c\ parser/sym_free.c\ parser/tree_func_free.c\ parser/tree_wrapper.c -======= -lexer/lexer_backslash.c\ -lexer/lexer_number.c\ -builtin/builtin_func.c\ -builtin/builtin_export.c\ -builtin/builtin_unsetenv.c\ -builtin/builtin_setenv.c\ -builtin/builtin_unset.c\ -builtin/builtin_math.c\ -builtin/bt_read_term.c\ -builtin/builtin_echo.c\ -builtin/builtin_hash.c\ -builtin/bt_env_opt.c\ -builtin/builtin_exit.c\ -builtin/builtin_cd.c\ -builtin/builtin_read.c\ -builtin/is_builtin.c\ -builtin/bt_read_get.c\ -builtin/builtin_history.c\ -builtin/builtin_env.c\ -exec/pset_brace.c\ -exec/pset_if.c\ -exec/pfree_func.c\ -exec/plaunch_subshell.c\ -exec/pset_case.c\ -exec/exec_ampersand.c\ -exec/exec_and_if.c\ -exec/exec_var.c\ -exec/exec_case_branch.c\ -exec/redirect_greatand.c\ -exec/redir_copy.c\ -exec/redir_free.c\ -exec/token_to_argv.c\ -exec/exec_pipe.c\ -exec/pfree_cond.c\ -exec/pset_for.c\ -exec/pset_until.c\ -exec/exec_func.c\ -exec/exec_or_if.c\ -exec/node_copy.c\ -exec/pfree_list.c\ -exec/redirect_dless.c\ -exec/exec_bang.c\ -exec/redirect_dgreat.c\ -exec/mark_process_status.c\ -exec/plaunch_for.c\ -exec/is_function.c\ -exec/pset_while.c\ -exec/exec_else.c\ -exec/ast_free.c\ -exec/exec_semi.c\ -exec/plaunch_while.c\ -exec/bad_fd.c\ -exec/exec_leaf.c\ -exec/plaunch_if.c\ -exec/plaunch_case.c\ -exec/process_redirect.c\ -exec/process_setgroup.c\ -exec/ft_exec.c\ -exec/set_exitstatus.c\ -exec/plaunch_brace.c\ -exec/plaunch_empty.c\ -exec/redirect_great.c\ -exec/process_set.c\ -exec/exec_reset.c\ -exec/plaunch_until.c\ -exec/pset_cmd.c\ -exec/redirect_lessand.c\ -exec/ft_findexec.c\ -exec/redirect_less.c\ -exec/pset_subshell.c\ -exec/fd_is_valid.c\ -exec/exec_elif.c\ -exec/plaunch_builtin.c\ -exec/pfree_subshell.c\ -exec/plaunch_file.c\ -exec/process_setsig.c\ -exec/plaunch_function.c\ -exec/process_launch.c\ -exec/pfree_cmd.c\ -hash_table/ft_add_hash.c\ -hash_table/is_hash.c\ -hash_table/hash.c\ -hash_table/hash_free.c\ -hash_table/hash_str.c ->>>>>>> master SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE)) OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o))