From 4852fc99abaf4d0738cd20605aa1c2db3c148b30 Mon Sep 17 00:00:00 2001 From: wescande Date: Sun, 19 Mar 2017 13:37:17 +0100 Subject: [PATCH 1/2] rectif pour la norme --- 42sh/file | 17 ----------------- .../{job-control => job_control}/builtin_bg.c | 0 .../{job-control => job_control}/builtin_fg.c | 0 .../{job-control => job_control}/builtin_jobs.c | 0 .../do_job_notification.c | 0 .../job_addprocess.c | 0 .../{job-control => job_control}/job_cmp_id.c | 0 .../{job-control => job_control}/job_format.c | 0 .../job_format_head.c | 0 .../src/{job-control => job_control}/job_free.c | 0 .../job_getprocess.c | 0 .../{job-control => job_control}/job_getrank.c | 0 .../job_is_completed.c | 0 .../job_is_stopped.c | 0 .../{job-control => job_control}/job_kill_all.c | 0 .../job_notify_change.c | 0 .../job_notify_new.c | 0 .../{job-control => job_control}/job_remove.c | 0 42sh/src/{job-control => job_control}/job_run.c | 0 .../job_update_id.c | 0 .../job_update_status.c | 0 .../src/{job-control => job_control}/job_wait.c | 0 .../mark_job_as_running.c | 0 .../{job-control => job_control}/pprint_brace.c | 0 .../{job-control => job_control}/pprint_case.c | 0 .../{job-control => job_control}/pprint_cmd.c | 0 .../{job-control => job_control}/pprint_for.c | 0 .../pprint_function.c | 0 .../{job-control => job_control}/pprint_if.c | 0 .../pprint_subshell.c | 0 .../{job-control => job_control}/pprint_until.c | 0 .../{job-control => job_control}/pprint_while.c | 0 .../process_cmp_pid.c | 0 .../process_format.c | 0 .../{job-control => job_control}/process_free.c | 0 .../put_job_in_background.c | 0 .../put_job_in_foreground.c | 0 .../sigchld_handler.c | 0 .../sigint_handler.c | 0 .../sigtstp_handler.c | 0 .../sigttin_handler.c | 0 .../sigttou_handler.c | 0 .../{line-editing => line_editing}/completion.c | 0 .../control_features.c | 0 .../copy_cut_paste.c | 0 .../{line-editing => line_editing}/ft_prompt.c | 0 .../{line-editing => line_editing}/get_key.c | 0 .../{line-editing => line_editing}/home_end.c | 0 .../init_history.c | 0 .../{line-editing => line_editing}/init_line.c | 0 .../init_termcaps.c | 0 .../lib_line_editing/ft_nb_line.c | 0 .../lib_line_editing/tool_line.c | 0 .../lib_line_editing/tool_line_2.c | 0 .../lib_line_editing/toolz.c | 0 .../lib_line_editing/toolz2.c | 0 .../lib_line_editing/toolz_parseur.c | 0 .../lib_line_editing/toolz_termcaps.c | 0 .../move_left_and_right.c | 0 .../move_to_word.c | 0 .../move_up_and_down.c | 0 .../print_and_del.c | 0 42sh/src/{line-editing => line_editing}/queue.c | 0 .../{line-editing => line_editing}/readline.c | 0 .../src/{line-editing => line_editing}/resize.c | 0 42sh/src/main/main.c | 2 +- 66 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 42sh/file rename 42sh/src/{job-control => job_control}/builtin_bg.c (100%) rename 42sh/src/{job-control => job_control}/builtin_fg.c (100%) rename 42sh/src/{job-control => job_control}/builtin_jobs.c (100%) rename 42sh/src/{job-control => job_control}/do_job_notification.c (100%) rename 42sh/src/{job-control => job_control}/job_addprocess.c (100%) rename 42sh/src/{job-control => job_control}/job_cmp_id.c (100%) rename 42sh/src/{job-control => job_control}/job_format.c (100%) rename 42sh/src/{job-control => job_control}/job_format_head.c (100%) rename 42sh/src/{job-control => job_control}/job_free.c (100%) rename 42sh/src/{job-control => job_control}/job_getprocess.c (100%) rename 42sh/src/{job-control => job_control}/job_getrank.c (100%) rename 42sh/src/{job-control => job_control}/job_is_completed.c (100%) rename 42sh/src/{job-control => job_control}/job_is_stopped.c (100%) rename 42sh/src/{job-control => job_control}/job_kill_all.c (100%) rename 42sh/src/{job-control => job_control}/job_notify_change.c (100%) rename 42sh/src/{job-control => job_control}/job_notify_new.c (100%) rename 42sh/src/{job-control => job_control}/job_remove.c (100%) rename 42sh/src/{job-control => job_control}/job_run.c (100%) rename 42sh/src/{job-control => job_control}/job_update_id.c (100%) rename 42sh/src/{job-control => job_control}/job_update_status.c (100%) rename 42sh/src/{job-control => job_control}/job_wait.c (100%) rename 42sh/src/{job-control => job_control}/mark_job_as_running.c (100%) rename 42sh/src/{job-control => job_control}/pprint_brace.c (100%) rename 42sh/src/{job-control => job_control}/pprint_case.c (100%) rename 42sh/src/{job-control => job_control}/pprint_cmd.c (100%) rename 42sh/src/{job-control => job_control}/pprint_for.c (100%) rename 42sh/src/{job-control => job_control}/pprint_function.c (100%) rename 42sh/src/{job-control => job_control}/pprint_if.c (100%) rename 42sh/src/{job-control => job_control}/pprint_subshell.c (100%) rename 42sh/src/{job-control => job_control}/pprint_until.c (100%) rename 42sh/src/{job-control => job_control}/pprint_while.c (100%) rename 42sh/src/{job-control => job_control}/process_cmp_pid.c (100%) rename 42sh/src/{job-control => job_control}/process_format.c (100%) rename 42sh/src/{job-control => job_control}/process_free.c (100%) rename 42sh/src/{job-control => job_control}/put_job_in_background.c (100%) rename 42sh/src/{job-control => job_control}/put_job_in_foreground.c (100%) rename 42sh/src/{job-control => job_control}/sigchld_handler.c (100%) rename 42sh/src/{job-control => job_control}/sigint_handler.c (100%) rename 42sh/src/{job-control => job_control}/sigtstp_handler.c (100%) rename 42sh/src/{job-control => job_control}/sigttin_handler.c (100%) rename 42sh/src/{job-control => job_control}/sigttou_handler.c (100%) rename 42sh/src/{line-editing => line_editing}/completion.c (100%) rename 42sh/src/{line-editing => line_editing}/control_features.c (100%) rename 42sh/src/{line-editing => line_editing}/copy_cut_paste.c (100%) rename 42sh/src/{line-editing => line_editing}/ft_prompt.c (100%) rename 42sh/src/{line-editing => line_editing}/get_key.c (100%) rename 42sh/src/{line-editing => line_editing}/home_end.c (100%) rename 42sh/src/{line-editing => line_editing}/init_history.c (100%) rename 42sh/src/{line-editing => line_editing}/init_line.c (100%) rename 42sh/src/{line-editing => line_editing}/init_termcaps.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/ft_nb_line.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/tool_line.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/tool_line_2.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/toolz.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/toolz2.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/toolz_parseur.c (100%) rename 42sh/src/{line-editing => line_editing}/lib_line_editing/toolz_termcaps.c (100%) rename 42sh/src/{line-editing => line_editing}/move_left_and_right.c (100%) rename 42sh/src/{line-editing => line_editing}/move_to_word.c (100%) rename 42sh/src/{line-editing => line_editing}/move_up_and_down.c (100%) rename 42sh/src/{line-editing => line_editing}/print_and_del.c (100%) rename 42sh/src/{line-editing => line_editing}/queue.c (100%) rename 42sh/src/{line-editing => line_editing}/readline.c (100%) rename 42sh/src/{line-editing => line_editing}/resize.c (100%) diff --git a/42sh/file b/42sh/file deleted file mode 100644 index 8e4e7ecb..00000000 --- a/42sh/file +++ /dev/null @@ -1,17 +0,0 @@ -42sh -42shelltest-tmp -Makefile -STDBUG -TESTSHELL -auteur -donovan_segaults_06-02 -file -includes -libft -objs -pdf -sample -scriptheader.sh -src -test_framework.sh -update_makefile.sh diff --git a/42sh/src/job-control/builtin_bg.c b/42sh/src/job_control/builtin_bg.c similarity index 100% rename from 42sh/src/job-control/builtin_bg.c rename to 42sh/src/job_control/builtin_bg.c diff --git a/42sh/src/job-control/builtin_fg.c b/42sh/src/job_control/builtin_fg.c similarity index 100% rename from 42sh/src/job-control/builtin_fg.c rename to 42sh/src/job_control/builtin_fg.c diff --git a/42sh/src/job-control/builtin_jobs.c b/42sh/src/job_control/builtin_jobs.c similarity index 100% rename from 42sh/src/job-control/builtin_jobs.c rename to 42sh/src/job_control/builtin_jobs.c diff --git a/42sh/src/job-control/do_job_notification.c b/42sh/src/job_control/do_job_notification.c similarity index 100% rename from 42sh/src/job-control/do_job_notification.c rename to 42sh/src/job_control/do_job_notification.c diff --git a/42sh/src/job-control/job_addprocess.c b/42sh/src/job_control/job_addprocess.c similarity index 100% rename from 42sh/src/job-control/job_addprocess.c rename to 42sh/src/job_control/job_addprocess.c diff --git a/42sh/src/job-control/job_cmp_id.c b/42sh/src/job_control/job_cmp_id.c similarity index 100% rename from 42sh/src/job-control/job_cmp_id.c rename to 42sh/src/job_control/job_cmp_id.c diff --git a/42sh/src/job-control/job_format.c b/42sh/src/job_control/job_format.c similarity index 100% rename from 42sh/src/job-control/job_format.c rename to 42sh/src/job_control/job_format.c diff --git a/42sh/src/job-control/job_format_head.c b/42sh/src/job_control/job_format_head.c similarity index 100% rename from 42sh/src/job-control/job_format_head.c rename to 42sh/src/job_control/job_format_head.c diff --git a/42sh/src/job-control/job_free.c b/42sh/src/job_control/job_free.c similarity index 100% rename from 42sh/src/job-control/job_free.c rename to 42sh/src/job_control/job_free.c diff --git a/42sh/src/job-control/job_getprocess.c b/42sh/src/job_control/job_getprocess.c similarity index 100% rename from 42sh/src/job-control/job_getprocess.c rename to 42sh/src/job_control/job_getprocess.c diff --git a/42sh/src/job-control/job_getrank.c b/42sh/src/job_control/job_getrank.c similarity index 100% rename from 42sh/src/job-control/job_getrank.c rename to 42sh/src/job_control/job_getrank.c diff --git a/42sh/src/job-control/job_is_completed.c b/42sh/src/job_control/job_is_completed.c similarity index 100% rename from 42sh/src/job-control/job_is_completed.c rename to 42sh/src/job_control/job_is_completed.c diff --git a/42sh/src/job-control/job_is_stopped.c b/42sh/src/job_control/job_is_stopped.c similarity index 100% rename from 42sh/src/job-control/job_is_stopped.c rename to 42sh/src/job_control/job_is_stopped.c diff --git a/42sh/src/job-control/job_kill_all.c b/42sh/src/job_control/job_kill_all.c similarity index 100% rename from 42sh/src/job-control/job_kill_all.c rename to 42sh/src/job_control/job_kill_all.c diff --git a/42sh/src/job-control/job_notify_change.c b/42sh/src/job_control/job_notify_change.c similarity index 100% rename from 42sh/src/job-control/job_notify_change.c rename to 42sh/src/job_control/job_notify_change.c diff --git a/42sh/src/job-control/job_notify_new.c b/42sh/src/job_control/job_notify_new.c similarity index 100% rename from 42sh/src/job-control/job_notify_new.c rename to 42sh/src/job_control/job_notify_new.c diff --git a/42sh/src/job-control/job_remove.c b/42sh/src/job_control/job_remove.c similarity index 100% rename from 42sh/src/job-control/job_remove.c rename to 42sh/src/job_control/job_remove.c diff --git a/42sh/src/job-control/job_run.c b/42sh/src/job_control/job_run.c similarity index 100% rename from 42sh/src/job-control/job_run.c rename to 42sh/src/job_control/job_run.c diff --git a/42sh/src/job-control/job_update_id.c b/42sh/src/job_control/job_update_id.c similarity index 100% rename from 42sh/src/job-control/job_update_id.c rename to 42sh/src/job_control/job_update_id.c diff --git a/42sh/src/job-control/job_update_status.c b/42sh/src/job_control/job_update_status.c similarity index 100% rename from 42sh/src/job-control/job_update_status.c rename to 42sh/src/job_control/job_update_status.c diff --git a/42sh/src/job-control/job_wait.c b/42sh/src/job_control/job_wait.c similarity index 100% rename from 42sh/src/job-control/job_wait.c rename to 42sh/src/job_control/job_wait.c diff --git a/42sh/src/job-control/mark_job_as_running.c b/42sh/src/job_control/mark_job_as_running.c similarity index 100% rename from 42sh/src/job-control/mark_job_as_running.c rename to 42sh/src/job_control/mark_job_as_running.c diff --git a/42sh/src/job-control/pprint_brace.c b/42sh/src/job_control/pprint_brace.c similarity index 100% rename from 42sh/src/job-control/pprint_brace.c rename to 42sh/src/job_control/pprint_brace.c diff --git a/42sh/src/job-control/pprint_case.c b/42sh/src/job_control/pprint_case.c similarity index 100% rename from 42sh/src/job-control/pprint_case.c rename to 42sh/src/job_control/pprint_case.c diff --git a/42sh/src/job-control/pprint_cmd.c b/42sh/src/job_control/pprint_cmd.c similarity index 100% rename from 42sh/src/job-control/pprint_cmd.c rename to 42sh/src/job_control/pprint_cmd.c diff --git a/42sh/src/job-control/pprint_for.c b/42sh/src/job_control/pprint_for.c similarity index 100% rename from 42sh/src/job-control/pprint_for.c rename to 42sh/src/job_control/pprint_for.c diff --git a/42sh/src/job-control/pprint_function.c b/42sh/src/job_control/pprint_function.c similarity index 100% rename from 42sh/src/job-control/pprint_function.c rename to 42sh/src/job_control/pprint_function.c diff --git a/42sh/src/job-control/pprint_if.c b/42sh/src/job_control/pprint_if.c similarity index 100% rename from 42sh/src/job-control/pprint_if.c rename to 42sh/src/job_control/pprint_if.c diff --git a/42sh/src/job-control/pprint_subshell.c b/42sh/src/job_control/pprint_subshell.c similarity index 100% rename from 42sh/src/job-control/pprint_subshell.c rename to 42sh/src/job_control/pprint_subshell.c diff --git a/42sh/src/job-control/pprint_until.c b/42sh/src/job_control/pprint_until.c similarity index 100% rename from 42sh/src/job-control/pprint_until.c rename to 42sh/src/job_control/pprint_until.c diff --git a/42sh/src/job-control/pprint_while.c b/42sh/src/job_control/pprint_while.c similarity index 100% rename from 42sh/src/job-control/pprint_while.c rename to 42sh/src/job_control/pprint_while.c diff --git a/42sh/src/job-control/process_cmp_pid.c b/42sh/src/job_control/process_cmp_pid.c similarity index 100% rename from 42sh/src/job-control/process_cmp_pid.c rename to 42sh/src/job_control/process_cmp_pid.c diff --git a/42sh/src/job-control/process_format.c b/42sh/src/job_control/process_format.c similarity index 100% rename from 42sh/src/job-control/process_format.c rename to 42sh/src/job_control/process_format.c diff --git a/42sh/src/job-control/process_free.c b/42sh/src/job_control/process_free.c similarity index 100% rename from 42sh/src/job-control/process_free.c rename to 42sh/src/job_control/process_free.c diff --git a/42sh/src/job-control/put_job_in_background.c b/42sh/src/job_control/put_job_in_background.c similarity index 100% rename from 42sh/src/job-control/put_job_in_background.c rename to 42sh/src/job_control/put_job_in_background.c diff --git a/42sh/src/job-control/put_job_in_foreground.c b/42sh/src/job_control/put_job_in_foreground.c similarity index 100% rename from 42sh/src/job-control/put_job_in_foreground.c rename to 42sh/src/job_control/put_job_in_foreground.c diff --git a/42sh/src/job-control/sigchld_handler.c b/42sh/src/job_control/sigchld_handler.c similarity index 100% rename from 42sh/src/job-control/sigchld_handler.c rename to 42sh/src/job_control/sigchld_handler.c diff --git a/42sh/src/job-control/sigint_handler.c b/42sh/src/job_control/sigint_handler.c similarity index 100% rename from 42sh/src/job-control/sigint_handler.c rename to 42sh/src/job_control/sigint_handler.c diff --git a/42sh/src/job-control/sigtstp_handler.c b/42sh/src/job_control/sigtstp_handler.c similarity index 100% rename from 42sh/src/job-control/sigtstp_handler.c rename to 42sh/src/job_control/sigtstp_handler.c diff --git a/42sh/src/job-control/sigttin_handler.c b/42sh/src/job_control/sigttin_handler.c similarity index 100% rename from 42sh/src/job-control/sigttin_handler.c rename to 42sh/src/job_control/sigttin_handler.c diff --git a/42sh/src/job-control/sigttou_handler.c b/42sh/src/job_control/sigttou_handler.c similarity index 100% rename from 42sh/src/job-control/sigttou_handler.c rename to 42sh/src/job_control/sigttou_handler.c diff --git a/42sh/src/line-editing/completion.c b/42sh/src/line_editing/completion.c similarity index 100% rename from 42sh/src/line-editing/completion.c rename to 42sh/src/line_editing/completion.c diff --git a/42sh/src/line-editing/control_features.c b/42sh/src/line_editing/control_features.c similarity index 100% rename from 42sh/src/line-editing/control_features.c rename to 42sh/src/line_editing/control_features.c diff --git a/42sh/src/line-editing/copy_cut_paste.c b/42sh/src/line_editing/copy_cut_paste.c similarity index 100% rename from 42sh/src/line-editing/copy_cut_paste.c rename to 42sh/src/line_editing/copy_cut_paste.c diff --git a/42sh/src/line-editing/ft_prompt.c b/42sh/src/line_editing/ft_prompt.c similarity index 100% rename from 42sh/src/line-editing/ft_prompt.c rename to 42sh/src/line_editing/ft_prompt.c diff --git a/42sh/src/line-editing/get_key.c b/42sh/src/line_editing/get_key.c similarity index 100% rename from 42sh/src/line-editing/get_key.c rename to 42sh/src/line_editing/get_key.c diff --git a/42sh/src/line-editing/home_end.c b/42sh/src/line_editing/home_end.c similarity index 100% rename from 42sh/src/line-editing/home_end.c rename to 42sh/src/line_editing/home_end.c diff --git a/42sh/src/line-editing/init_history.c b/42sh/src/line_editing/init_history.c similarity index 100% rename from 42sh/src/line-editing/init_history.c rename to 42sh/src/line_editing/init_history.c diff --git a/42sh/src/line-editing/init_line.c b/42sh/src/line_editing/init_line.c similarity index 100% rename from 42sh/src/line-editing/init_line.c rename to 42sh/src/line_editing/init_line.c diff --git a/42sh/src/line-editing/init_termcaps.c b/42sh/src/line_editing/init_termcaps.c similarity index 100% rename from 42sh/src/line-editing/init_termcaps.c rename to 42sh/src/line_editing/init_termcaps.c diff --git a/42sh/src/line-editing/lib_line_editing/ft_nb_line.c b/42sh/src/line_editing/lib_line_editing/ft_nb_line.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/ft_nb_line.c rename to 42sh/src/line_editing/lib_line_editing/ft_nb_line.c diff --git a/42sh/src/line-editing/lib_line_editing/tool_line.c b/42sh/src/line_editing/lib_line_editing/tool_line.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/tool_line.c rename to 42sh/src/line_editing/lib_line_editing/tool_line.c diff --git a/42sh/src/line-editing/lib_line_editing/tool_line_2.c b/42sh/src/line_editing/lib_line_editing/tool_line_2.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/tool_line_2.c rename to 42sh/src/line_editing/lib_line_editing/tool_line_2.c diff --git a/42sh/src/line-editing/lib_line_editing/toolz.c b/42sh/src/line_editing/lib_line_editing/toolz.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/toolz.c rename to 42sh/src/line_editing/lib_line_editing/toolz.c diff --git a/42sh/src/line-editing/lib_line_editing/toolz2.c b/42sh/src/line_editing/lib_line_editing/toolz2.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/toolz2.c rename to 42sh/src/line_editing/lib_line_editing/toolz2.c diff --git a/42sh/src/line-editing/lib_line_editing/toolz_parseur.c b/42sh/src/line_editing/lib_line_editing/toolz_parseur.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/toolz_parseur.c rename to 42sh/src/line_editing/lib_line_editing/toolz_parseur.c diff --git a/42sh/src/line-editing/lib_line_editing/toolz_termcaps.c b/42sh/src/line_editing/lib_line_editing/toolz_termcaps.c similarity index 100% rename from 42sh/src/line-editing/lib_line_editing/toolz_termcaps.c rename to 42sh/src/line_editing/lib_line_editing/toolz_termcaps.c diff --git a/42sh/src/line-editing/move_left_and_right.c b/42sh/src/line_editing/move_left_and_right.c similarity index 100% rename from 42sh/src/line-editing/move_left_and_right.c rename to 42sh/src/line_editing/move_left_and_right.c diff --git a/42sh/src/line-editing/move_to_word.c b/42sh/src/line_editing/move_to_word.c similarity index 100% rename from 42sh/src/line-editing/move_to_word.c rename to 42sh/src/line_editing/move_to_word.c diff --git a/42sh/src/line-editing/move_up_and_down.c b/42sh/src/line_editing/move_up_and_down.c similarity index 100% rename from 42sh/src/line-editing/move_up_and_down.c rename to 42sh/src/line_editing/move_up_and_down.c diff --git a/42sh/src/line-editing/print_and_del.c b/42sh/src/line_editing/print_and_del.c similarity index 100% rename from 42sh/src/line-editing/print_and_del.c rename to 42sh/src/line_editing/print_and_del.c diff --git a/42sh/src/line-editing/queue.c b/42sh/src/line_editing/queue.c similarity index 100% rename from 42sh/src/line-editing/queue.c rename to 42sh/src/line_editing/queue.c diff --git a/42sh/src/line-editing/readline.c b/42sh/src/line_editing/readline.c similarity index 100% rename from 42sh/src/line-editing/readline.c rename to 42sh/src/line_editing/readline.c diff --git a/42sh/src/line-editing/resize.c b/42sh/src/line_editing/resize.c similarity index 100% rename from 42sh/src/line-editing/resize.c rename to 42sh/src/line_editing/resize.c diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c index ea5006dc..34394cc0 100644 --- a/42sh/src/main/main.c +++ b/42sh/src/main/main.c @@ -93,7 +93,7 @@ static int handle_instruction(t_list **token, t_btree **ast) if (do_parser_routine(token, ast) > 0) break ; } - /* btree_print(STDBUG, ast, &ft_putast); */ + btree_print(STDBUG, *ast, &ft_putast); if (data->parser.state == SUCCESS && ft_exec(ast) < 0) exit(1); if (SH_IS_INTERACTIVE(data->opts) && data->lexer.str) From c8c9049661783b9dacc72329f347082bcfffce1b Mon Sep 17 00:00:00 2001 From: wescande Date: Sun, 19 Mar 2017 13:44:44 +0100 Subject: [PATCH 2/2] modif makefile + script --- 42sh/Makefile | 128 ++++++++++++++++++++-------------------- 42sh/update_makefile.sh | 2 +- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/42sh/Makefile b/42sh/Makefile index f57a96da..8d15f1b5 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -168,47 +168,47 @@ 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/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_is_completed.c\ -job-control/job_is_stopped.c\ -job-control/job_kill_all.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\ +job_control/builtin_bg.c\ +job_control/builtin_fg.c\ +job_control/builtin_jobs.c\ +job_control/do_job_notification.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_is_completed.c\ +job_control/job_is_stopped.c\ +job_control/job_kill_all.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/get_lexer_stack.c\ lexer/get_reserved_words.c\ lexer/get_state_global.c\ @@ -238,29 +238,29 @@ lexer/token_cmp_type.c\ lexer/token_free.c\ lexer/token_init.c\ lexer/token_print.c\ -line-editing/completion.c\ -line-editing/control_features.c\ -line-editing/copy_cut_paste.c\ -line-editing/ft_prompt.c\ -line-editing/get_key.c\ -line-editing/home_end.c\ -line-editing/init_history.c\ -line-editing/init_line.c\ -line-editing/init_termcaps.c\ -line-editing/lib_line_editing/ft_nb_line.c\ -line-editing/lib_line_editing/tool_line.c\ -line-editing/lib_line_editing/tool_line_2.c\ -line-editing/lib_line_editing/toolz.c\ -line-editing/lib_line_editing/toolz2.c\ -line-editing/lib_line_editing/toolz_parseur.c\ -line-editing/lib_line_editing/toolz_termcaps.c\ -line-editing/move_left_and_right.c\ -line-editing/move_to_word.c\ -line-editing/move_up_and_down.c\ -line-editing/print_and_del.c\ -line-editing/queue.c\ -line-editing/readline.c\ -line-editing/resize.c\ +line_editing/completion.c\ +line_editing/control_features.c\ +line_editing/copy_cut_paste.c\ +line_editing/ft_prompt.c\ +line_editing/get_key.c\ +line_editing/home_end.c\ +line_editing/init_history.c\ +line_editing/init_line.c\ +line_editing/init_termcaps.c\ +line_editing/lib_line_editing/ft_nb_line.c\ +line_editing/lib_line_editing/tool_line.c\ +line_editing/lib_line_editing/tool_line_2.c\ +line_editing/lib_line_editing/toolz.c\ +line_editing/lib_line_editing/toolz2.c\ +line_editing/lib_line_editing/toolz_parseur.c\ +line_editing/lib_line_editing/toolz_termcaps.c\ +line_editing/move_left_and_right.c\ +line_editing/move_to_word.c\ +line_editing/move_up_and_down.c\ +line_editing/print_and_del.c\ +line_editing/queue.c\ +line_editing/readline.c\ +line_editing/resize.c\ main/data_exit.c\ main/data_init.c\ main/data_singleton.c\ diff --git a/42sh/update_makefile.sh b/42sh/update_makefile.sh index a1b3228d..0a4660f5 100755 --- a/42sh/update_makefile.sh +++ b/42sh/update_makefile.sh @@ -5,7 +5,7 @@ then echo "regenerate Makefile" sed "`grep -n 'SRC_BASE =' $CUR_MAKEFILE | sed 's/:.*//'`, \$d" $CUR_MAKEFILE > NEWMAKEFILE grep 'SRC_BASE =' $CUR_MAKEFILE >> NEWMAKEFILE - expr "$(find ./src | grep "\.c" | sed -e 's/src\///' -e 's/\.\///' -e 's/$/\\/')" : "\(.*\).$" >> NEWMAKEFILE + expr "$(find ./src | grep "\.c$" | sed -e 's/src\///' -e 's/\.\///' -e 's/$/\\/')" : "\(.*\).$" >> NEWMAKEFILE echo "" >> NEWMAKEFILE grep 'SRCS =' $CUR_MAKEFILE >> NEWMAKEFILE sed "1, `grep -n 'SRCS =' $CUR_MAKEFILE | sed 's/:.*//'`d" $CUR_MAKEFILE >> NEWMAKEFILE