jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/jzck/42sh

Browse source
This commit is contained in:
Jack Halford 2017-03-22 16:50:46 +01:00
commit ee82674e93
6 changed files with 525 additions and 348 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

775
42sh/log
View file

@ -1,313 +1,462 @@
Norme: ./src/builtin/bt_read_get.c On branch master
Norme: ./src/builtin/builtin_echo.c Your branch is up-to-date with 'origin/master'.
Norme: ./src/builtin/bt_read_term.c Changes to be committed:
Norme: ./src/builtin/builtin_exit.c (use "git reset HEAD <file>..." to unstage)
Norme: ./src/builtin/builtin_hash.c
Norme: ./src/builtin/builtin_history.c deleted: libft/objs/btree/btree_apply_by_level.d
Norme: ./src/builtin/builtin_export.c deleted: libft/objs/btree/btree_apply_infix.d
Norme: ./src/builtin/builtin_cd.c deleted: libft/objs/btree/btree_apply_prefix.d
Norme: ./src/builtin/builtin_return_status.c deleted: libft/objs/btree/btree_apply_suffix.d
Norme: ./src/builtin/builtin_env.c deleted: libft/objs/btree/btree_create_node.d
Error (line 61): function env_treat_flag has 32 lines deleted: libft/objs/btree/btree_del.d
Norme: ./src/builtin/builtin_unset.c deleted: libft/objs/btree/btree_delone.d
Norme: ./src/builtin/builtin_unsetenv.c deleted: libft/objs/btree/btree_insert_data.d
Norme: ./src/builtin/builtin_setenv.c deleted: libft/objs/btree/btree_level_count.d
Error (line 15): wrong number of spaces in preprocessor line deleted: libft/objs/btree/btree_map.d
Norme: ./src/builtin/error_msg.c deleted: libft/objs/btree/btree_print.d
Norme: ./src/builtin/is_builtin.c deleted: libft/objs/btree/btree_search_item.d
Norme: ./src/builtin/builtin_read.c deleted: libft/objs/char/ft_isalnum.d
Norme: ./src/completion/c_arrow.c deleted: libft/objs/char/ft_isalpha.d
Norme: ./src/builtin/builtin_math.c deleted: libft/objs/char/ft_isascii.d
Norme: ./src/completion/c_find_abspath.c deleted: libft/objs/char/ft_isdigit.d
Norme: ./src/completion/c_find_binary.c deleted: libft/objs/char/ft_isprint.d
Norme: ./src/completion/c_find_env.c deleted: libft/objs/char/ft_tolower.d
Norme: ./src/completion/c_clear.c deleted: libft/objs/char/ft_toupper.d
Norme: ./src/completion/c_match.c deleted: libft/objs/cliopts/cliopts_get.d
Norme: ./src/completion/c_init.c deleted: libft/objs/cliopts/cliopts_has.d
Norme: ./src/completion/c_find_files.c deleted: libft/objs/color/ft_color_mk.d
Norme: ./src/completion/c_misc.c deleted: libft/objs/color/ft_color_mkif.d
Norme: ./src/completion/c_match_glob.c deleted: libft/objs/color/ft_color_reset.d
Error (line 19): function c_replace_globbing has 27 lines deleted: libft/objs/color/ft_color_set.d
Norme: ./src/completion/c_match_update.c deleted: libft/objs/dlst/ft_dlstadd_after.d
Norme: ./src/completion/c_parser.c deleted: libft/objs/dlst/ft_dlstadd_before.d
Norme: ./src/completion/c_output.c deleted: libft/objs/dlst/ft_dlstdel.d
Norme: ./src/completion/c_sizing.c deleted: libft/objs/dlst/ft_dlstdelone.d
Norme: ./src/completion/c_terminal.c deleted: libft/objs/dlst/ft_dlstlast.d
Norme: ./src/completion/c_printer.c deleted: libft/objs/dlst/ft_dlstnew.d
Norme: ./src/exec/bad_fd.c deleted: libft/objs/dlst/ft_dlstrtostr.d
Norme: ./src/completion/completion.c deleted: libft/objs/dlst/ft_dlstsize.d
Norme: ./src/exec/error_badidentifier.c deleted: libft/objs/error/error.d
Norme: ./src/exec/ast_free.c deleted: libft/objs/ft_printf/ft_conversion.d
Norme: ./src/exec/exec_ampersand.c deleted: libft/objs/ft_printf/ft_fmt_simplify.d
Norme: ./src/exec/exec_and_if.c deleted: libft/objs/ft_printf/ft_fmt_validate_conv.d
Norme: ./src/exec/exec_bang.c deleted: libft/objs/ft_printf/ft_fmt_validate_flags.d
Norme: ./src/exec/exec_else.c deleted: libft/objs/ft_printf/ft_fmt_validate_mod.d
Norme: ./src/exec/exec_elif.c deleted: libft/objs/ft_printf/ft_printf.d
Norme: ./src/exec/exec_case_branch.c deleted: libft/objs/ft_printf/ft_printf_color.d
Norme: ./src/exec/exec_pipe.c deleted: libft/objs/ft_printf/ft_printf_parse.d
Norme: ./src/exec/exec_or_if.c deleted: libft/objs/ft_printf/ft_transform.d
Norme: ./src/exec/exec_semi.c deleted: libft/objs/ft_printf/ft_vprintf.d
Norme: ./src/exec/exec_var.c deleted: libft/objs/ft_printf/lib_fmt.d
Norme: ./src/exec/exec_reset.c deleted: libft/objs/ft_printf/lib_fmt_error.d
Norme: ./src/exec/fd_is_valid.c deleted: libft/objs/ft_printf/lib_pad.d
Norme: ./src/completion/c_pathsolver.c deleted: libft/objs/ft_printf/lib_pad_sharp.d
Norme: ./src/exec/exec_leaf.c deleted: libft/objs/get_next_line/get_next_line.d
Error (line 55): bad indentation deleted: libft/objs/lst/ft_id.d
Norme: ./src/exec/mark_process_status.c deleted: libft/objs/lst/ft_lst_at.d
Norme: ./src/exec/is_function.c deleted: libft/objs/lst/ft_lst_bfree.d
Error (line 31, col 3): missing space after break deleted: libft/objs/lst/ft_lst_cfree.d
Norme: ./src/exec/ft_findexec.c deleted: libft/objs/lst/ft_lst_delif.d
Norme: ./src/exec/pfree_cmd.c deleted: libft/objs/lst/ft_lst_delsub.d
Norme: ./src/exec/pfree_func.c deleted: libft/objs/lst/ft_lst_filter.d
Norme: ./src/exec/pfree_cond.c deleted: libft/objs/lst/ft_lst_find.d
Norme: ./src/exec/ft_exec.c deleted: libft/objs/lst/ft_lst_merge.d
Norme: ./src/exec/pfree_subshell.c deleted: libft/objs/lst/ft_lst_order_delsub.d
Norme: ./src/exec/node_copy.c deleted: libft/objs/lst/ft_lst_print.d
Norme: ./src/exec/pfree_list.c deleted: libft/objs/lst/ft_lst_print2.d
Norme: ./src/exec/plaunch_brace.c deleted: libft/objs/lst/ft_lst_removeif.d
Norme: ./src/exec/plaunch_empty.c deleted: libft/objs/lst/ft_lst_reverse.d
Norme: ./src/exec/plaunch_builtin.c deleted: libft/objs/lst/ft_lst_size.d
Norme: ./src/exec/plaunch_case.c deleted: libft/objs/lst/ft_lst_sorted_insert.d
Norme: ./src/exec/plaunch_if.c deleted: libft/objs/lst/ft_lst_sorted_merge.d
Error (line 19): comment not well formatted deleted: libft/objs/lst/ft_lstadd.d
Error (line 19): comment not well placed deleted: libft/objs/lst/ft_lstdel.d
Norme: ./src/exec/plaunch_subshell.c deleted: libft/objs/lst/ft_lstdelone.d
Norme: ./src/exec/plaunch_function.c deleted: libft/objs/lst/ft_lsteadd.d
Error (line 15): spaces at the end of line deleted: libft/objs/lst/ft_lstiter.d
Error (line 29): spaces at the end of line deleted: libft/objs/lst/ft_lstlast.d
Error (line 29, col 19): bad character after ; deleted: libft/objs/lst/ft_lstmap.d
Norme: ./src/exec/plaunch_for.c deleted: libft/objs/lst/ft_lstnadd.d
Norme: ./src/exec/plaunch_while.c deleted: libft/objs/lst/ft_lstnew.d
Norme: ./src/exec/plaunch_file.c deleted: libft/objs/lst/ft_lstnew_range.d
Norme: ./src/exec/plaunch_until.c deleted: libft/objs/lst/ft_lstsort.d
Norme: ./src/exec/process_resetfds.c deleted: libft/objs/lst/pop.d
Error (line 25): comment not well formatted deleted: libft/objs/lst/push.d
Error (line 25): bad indentation deleted: libft/objs/math/ft_addrcmp.d
Error (line 25): line has 146 characters deleted: libft/objs/math/ft_ilen.d
Error (line 25): comment not well placed deleted: libft/objs/math/ft_ilen_base.d
Error (line 26): comment not well formatted deleted: libft/objs/math/ft_itoa.d
Error (line 26): bad indentation deleted: libft/objs/math/ft_itoa_base.d
Error (line 26): comment not well placed deleted: libft/objs/math/ft_lllen.d
Error (line 27): bad indentation deleted: libft/objs/math/ft_lllen_base.d
Error (line 28): comment not well formatted deleted: libft/objs/math/ft_lltoa_base.d
Error (line 28): comment not well placed deleted: libft/objs/math/ft_uilen.d
Error (line 29): comment not well formatted deleted: libft/objs/math/ft_uitoa_base.d
Error (line 29): comment not well placed deleted: libft/objs/math/ft_ulltoa_base.d
Error (line 30): comment not well formatted deleted: libft/objs/math/id.d
Error (line 30): comment not well placed deleted: libft/objs/mem/ft_bzero.d
Norme: ./src/exec/process_setgroup.c deleted: libft/objs/mem/ft_malloc.d
Norme: ./src/exec/process_launch.c deleted: libft/objs/mem/ft_memalloc.d
Error (line 49): comment not well formatted deleted: libft/objs/mem/ft_memccpy.d
Error (line 49): comment not well placed deleted: libft/objs/mem/ft_memchr.d
Error (line 50): comment not well formatted deleted: libft/objs/mem/ft_memcmp.d
Error (line 50): comment not well placed deleted: libft/objs/mem/ft_memcpy.d
Error (line 67): bad indentation deleted: libft/objs/mem/ft_memdel.d
Norme: ./src/exec/process_setsig.c deleted: libft/objs/mem/ft_memmove.d
Norme: ./src/exec/pset_brace.c deleted: libft/objs/mem/ft_memset.d
Norme: ./src/exec/process_redirect.c deleted: libft/objs/mem/ft_realloc.d
Norme: ./src/exec/pset_case.c deleted: libft/objs/path/ft_path_notdir.d
Norme: ./src/exec/pset_for.c deleted: libft/objs/printing/ft_putchar.d
Norme: ./src/exec/pset_if.c deleted: libft/objs/printing/ft_putendl.d
Norme: ./src/exec/pset_subshell.c deleted: libft/objs/printing/ft_putnbr.d
Norme: ./src/exec/pset_until.c deleted: libft/objs/printing/ft_putstr.d
Norme: ./src/exec/process_set.c deleted: libft/objs/sstr/ft_sstradd.d
Error (line 47): function process_set has 26 lines deleted: libft/objs/sstr/ft_sstrcat.d
Norme: ./src/exec/pset_while.c deleted: libft/objs/sstr/ft_sstrdel.d
Norme: ./src/exec/redir_free.c deleted: libft/objs/sstr/ft_sstrdup.d
Norme: ./src/exec/pset_cmd.c deleted: libft/objs/sstr/ft_sstrfree.d
Norme: ./src/exec/redirect_dgreat.c deleted: libft/objs/sstr/ft_sstrprint.d
Norme: ./src/exec/redir_copy.c deleted: libft/objs/sstr/ft_sstrprint_fd.d
Norme: ./src/exec/redirect_great.c deleted: libft/objs/sstr/ft_sstrsort.d
Norme: ./src/exec/redirect_dless.c deleted: libft/objs/sstr/ft_sstrstr.d
Norme: ./src/exec/redirect_less.c deleted: libft/objs/str/ft_atoi.d
Norme: ./src/exec/redirect_greatand.c deleted: libft/objs/str/ft_convert_base.d
Norme: ./src/exec/set_exitstatus.c deleted: libft/objs/str/ft_putaddr_fd.d
Norme: ./src/exec/redirect_lessand.c deleted: libft/objs/str/ft_split_whitespaces.d
Norme: ./src/exec/token_to_argv.c deleted: libft/objs/str/ft_str3join.d
Norme: ./src/glob/esc_print.c deleted: libft/objs/str/ft_strappend.d
Norme: ./src/glob/dir_glob.c deleted: libft/objs/str/ft_strbetween.d
Norme: ./src/glob/command_getoutput.c deleted: libft/objs/str/ft_strcat.d
Error: global scope bad aligned deleted: libft/objs/str/ft_strcatf.d
Error (line 47): line has 83 characters deleted: libft/objs/str/ft_strchr.d
Error (line 52): function execute_command has 26 lines deleted: libft/objs/str/ft_strchrcpy.d
Norme: ./src/glob/expand_home.c deleted: libft/objs/str/ft_strclr.d
Norme: ./src/glob/expand_esc.c deleted: libft/objs/str/ft_strcmp.d
Norme: ./src/glob/ft_strsplit_esc.c deleted: libft/objs/str/ft_strcpy.d
Error (line 69): line has 84 characters deleted: libft/objs/str/ft_strcspn.d
Norme: ./src/glob/expand_brace.c deleted: libft/objs/str/ft_strcut.d
Norme: ./src/glob/expand_var.c deleted: libft/objs/str/ft_strdel.d
Norme: ./src/glob/gen_tab_esc.c deleted: libft/objs/str/ft_strdup.d
Norme: ./src/glob/is_char_esc.c deleted: libft/objs/str/ft_strdupchr.d
Norme: ./src/glob/ft_strsplit_spe.c deleted: libft/objs/str/ft_strduptr.d
Norme: ./src/glob/tab_esc_copy.c deleted: libft/objs/str/ft_strequ.d
Norme: ./src/glob/word_is_assignment.c deleted: libft/objs/str/ft_strinsert.d
Norme: ./src/glob/glob.c deleted: libft/objs/str/ft_stris.d
Norme: ./src/hash_table/hash.c deleted: libft/objs/str/ft_striter.d
Norme: ./src/hash_table/ft_add_hash.c deleted: libft/objs/str/ft_striteri.d
Norme: ./src/hash_table/hash_str.c deleted: libft/objs/str/ft_strjoin.d
Norme: ./src/hash_table/hash_free.c deleted: libft/objs/str/ft_strlcat.d
Norme: ./src/hash_table/is_hash.c deleted: libft/objs/str/ft_strlen.d
Norme: ./src/history/add_str_in_history.c deleted: libft/objs/str/ft_strlenchr.d
Norme: ./src/glob/expand_bquote.c deleted: libft/objs/str/ft_strmap.d
Error: 6 functions in the file deleted: libft/objs/str/ft_strmapi.d
Norme: ./src/history/history.c deleted: libft/objs/str/ft_strncat.d
Norme: ./src/history/history_parsing_toolz_2.c deleted: libft/objs/str/ft_strncmp.d
Norme: ./src/history/history_parsing_toolz.c deleted: libft/objs/str/ft_strncpy.d
Norme: ./src/history/list_toolz.c deleted: libft/objs/str/ft_strnequ.d
Norme: ./src/glob/match_pattern.c deleted: libft/objs/str/ft_strnew.d
Error (line 75): line has 82 characters deleted: libft/objs/str/ft_strnstr.d
Norme: ./src/history/history_parsing.c deleted: libft/objs/str/ft_strrchr.d
Norme: ./src/job_control/builtin_bg.c deleted: libft/objs/str/ft_strreplace.d
Norme: ./src/job_control/do_job_notification.c deleted: libft/objs/str/ft_strrev.d
Norme: ./src/job_control/builtin_fg.c deleted: libft/objs/str/ft_strsplit.d
Error (line 15): function builtin_fg has 31 lines deleted: libft/objs/str/ft_strstr.d
Norme: ./src/job_control/has_running_job.c deleted: libft/objs/str/ft_strsub.d
Norme: ./src/history/surch_in_history.c deleted: libft/objs/str/ft_strtok.d
Norme: ./src/job_control/has_stopped_job.c deleted: libft/objs/str/ft_strtrim.d
Norme: ./src/job_control/job_cmp_id.c deleted: libft/objs/sys/dup2_close.d
Norme: ./src/job_control/job_format.c deleted: libft/objs/sys/fd_replace.d
Norme: ./src/job_control/job_addprocess.c deleted: libft/objs/sys/ft_getenv.d
Error (line 27): comment not well formatted deleted: libft/objs/sys/ft_xattr_count.d
Error (line 27): comment not well placed deleted: libft/objs/sys/ft_xattr_print.d
Norme: ./src/job_control/job_free.c deleted: libft/objs/time/ft_mytime_free.d
Norme: ./src/job_control/builtin_jobs.c deleted: libft/objs/time/ft_mytime_get.d
Norme: ./src/job_control/job_format_head.c deleted: libft/objs/time/ft_time_isrecent.d
Norme: ./src/job_control/job_getprocess.c deleted: objs/builtin/bt_read_get.d
Norme: ./src/job_control/job_hup_all.c deleted: objs/builtin/bt_read_term.d
Norme: ./src/job_control/job_is_completed.c deleted: objs/builtin/builtin_cd.d
Norme: ./src/job_control/job_is_stopped.c deleted: objs/builtin/builtin_echo.d
Norme: ./src/job_control/job_notify_change.c deleted: objs/builtin/builtin_env.d
Norme: ./src/job_control/job_getrank.c deleted: objs/builtin/builtin_exit.d
Norme: ./src/job_control/job_run.c deleted: objs/builtin/builtin_export.d
Norme: ./src/job_control/job_notify_new.c deleted: objs/builtin/builtin_hash.d
Norme: ./src/job_control/job_update_id.c deleted: objs/builtin/builtin_history.d
Norme: ./src/job_control/job_remove.c deleted: objs/builtin/builtin_math.d
Norme: ./src/job_control/job_update_status.c deleted: objs/builtin/builtin_read.d
Norme: ./src/job_control/pprint_brace.c deleted: objs/builtin/builtin_return_status.d
Norme: ./src/job_control/mark_job_as_running.c deleted: objs/builtin/builtin_setenv.d
Norme: ./src/job_control/pprint_case.c deleted: objs/builtin/builtin_unset.d
Norme: ./src/job_control/pprint_cmd.c deleted: objs/builtin/builtin_unsetenv.d
Norme: ./src/job_control/pprint_for.c deleted: objs/builtin/error_msg.d
Norme: ./src/job_control/pprint_function.c deleted: objs/builtin/is_builtin.d
Norme: ./src/job_control/pprint_if.c deleted: objs/completion/c_arrow.d
Norme: ./src/job_control/pprint_until.c deleted: objs/completion/c_clear.d
Norme: ./src/job_control/pprint_subshell.c deleted: objs/completion/c_find_abspath.d
Norme: ./src/job_control/pprint_while.c deleted: objs/completion/c_find_binary.d
Norme: ./src/job_control/job_wait.c deleted: objs/completion/c_find_env.d
Norme: ./src/job_control/process_cmp_pid.c deleted: objs/completion/c_find_files.d
Norme: ./src/job_control/put_job_in_background.c deleted: objs/completion/c_init.d
Norme: ./src/job_control/process_free.c deleted: objs/completion/c_match.d
Norme: ./src/job_control/sigchld_handler.c deleted: objs/completion/c_match_glob.d
Norme: ./src/job_control/sigint_handler.c deleted: objs/completion/c_match_update.d
Norme: ./src/job_control/sigtstp_handler.c deleted: objs/completion/c_misc.d
Norme: ./src/job_control/sigttou_handler.c deleted: objs/completion/c_output.d
Norme: ./src/job_control/sigttin_handler.c deleted: objs/completion/c_parser.d
Norme: ./src/lexer/get_lexer_stack.c deleted: objs/completion/c_pathsolver.d
Norme: ./src/job_control/put_job_in_foreground.c deleted: objs/completion/c_printer.d
Norme: ./src/lexer/do_lexer_routine.c deleted: objs/completion/c_sizing.d
Error (line 15): function do_lexer_routine has 27 lines deleted: objs/completion/c_terminal.d
Error (line 24): missing newline after if deleted: objs/completion/completion.d
Error (line 24): spaces at the end of line deleted: objs/exec/ast_free.d
Error (line 28): spaces at the end of line deleted: objs/exec/bad_fd.d
Norme: ./src/lexer/get_state_redir.c deleted: objs/exec/error_badidentifier.d
Norme: ./src/lexer/get_state_global.c deleted: objs/exec/exec_ampersand.d
Norme: ./src/lexer/insert_newline.c deleted: objs/exec/exec_and_if.d
Norme: ./src/lexer/isrw_delim.c deleted: objs/exec/exec_bang.d
Error (line 15): spaces at the end of line deleted: objs/exec/exec_case_branch.d
Error (line 19): spaces at the end of line deleted: objs/exec/exec_elif.d
Norme: ./src/lexer/keep_last_type.c deleted: objs/exec/exec_else.d
Error (line 22): spaces at the end of line deleted: objs/exec/exec_leaf.d
Error (line 22, col 0): no newline after block deleted: objs/exec/exec_or_if.d
Norme: ./src/lexer/get_reserved_words.c deleted: objs/exec/exec_pipe.d
Error (line 41): spaces at the end of line deleted: objs/exec/exec_reset.d
Norme: ./src/lexer/lexer_backslash.c deleted: objs/exec/exec_semi.d
Norme: ./src/job_control/process_format.c deleted: objs/exec/exec_var.d
Norme: ./src/lexer/lexer_default.c deleted: objs/exec/fd_is_valid.d
Norme: ./src/lexer/lexer_destroy.c deleted: objs/exec/ft_exec.d
Norme: ./src/lexer/lexer_bquote.c deleted: objs/exec/ft_findexec.d
Norme: ./src/lexer/lexer_curly_braces.c deleted: objs/exec/is_function.d
Norme: ./src/lexer/lexer_delim.c deleted: objs/exec/mark_process_status.d
Norme: ./src/lexer/lexer_end.c deleted: objs/exec/node_copy.d
Norme: ./src/lexer/lexer_heredoc.c deleted: objs/exec/pfree_cmd.d
Norme: ./src/lexer/lexer_init.c deleted: objs/exec/pfree_cond.d
Norme: ./src/lexer/lexer_great.c deleted: objs/exec/pfree_func.d
Norme: ./src/lexer/lexer_newline.c deleted: objs/exec/pfree_list.d
Norme: ./src/lexer/lexer_dquote.c deleted: objs/exec/pfree_subshell.d
Norme: ./src/lexer/lexer_less.c deleted: objs/exec/plaunch_brace.d
Norme: ./src/lexer/lexer_lex.c deleted: objs/exec/plaunch_builtin.d
Norme: ./src/lexer/lexer_paren.c deleted: objs/exec/plaunch_case.d
Norme: ./src/lexer/lexer_quote.c deleted: objs/exec/plaunch_empty.d
Norme: ./src/lexer/lexer_number.c deleted: objs/exec/plaunch_file.d
Norme: ./src/lexer/token_cmp_type.c deleted: objs/exec/plaunch_for.d
Norme: ./src/lexer/lexer_word.c deleted: objs/exec/plaunch_function.d
Norme: ./src/lexer/lexer_sep.c deleted: objs/exec/plaunch_if.d
Norme: ./src/lexer/token_free.c deleted: objs/exec/plaunch_subshell.d
Norme: ./src/lexer/token_print.c deleted: objs/exec/plaunch_until.d
Norme: ./src/lexer/token_init.c deleted: objs/exec/plaunch_while.d
Norme: ./src/lexer/token_append.c deleted: objs/exec/process_launch.d
Norme: ./src/line_editing/control_features.c deleted: objs/exec/process_redirect.d
Norme: ./src/line_editing/completion.c deleted: objs/exec/process_resetfds.d
Norme: ./src/line_editing/home_end.c deleted: objs/exec/process_set.d
Norme: ./src/line_editing/copy_cut_paste.c deleted: objs/exec/process_setgroup.d
Error (line 40): function ft_v has 26 lines deleted: objs/exec/process_setsig.d
Norme: ./src/line_editing/init_line.c deleted: objs/exec/pset_brace.d
Norme: ./src/line_editing/init_history.c deleted: objs/exec/pset_case.d
Norme: ./src/line_editing/init_termcaps.c deleted: objs/exec/pset_cmd.d
Norme: ./src/line_editing/ft_prompt.c deleted: objs/exec/pset_for.d
Norme: ./src/line_editing/get_key.c deleted: objs/exec/pset_if.d
Norme: ./src/line_editing/move_left_and_right.c deleted: objs/exec/pset_subshell.d
Norme: ./src/line_editing/move_up_and_down.c deleted: objs/exec/pset_until.d
Norme: ./src/line_editing/readline.c deleted: objs/exec/pset_while.d
Error (line 15): function readline has 27 lines deleted: objs/exec/redir_copy.d
Norme: ./src/line_editing/resize.c deleted: objs/exec/redir_free.d
Norme: ./src/line_editing/queue.c deleted: objs/exec/redirect_dgreat.d
Norme: ./src/main/data_exit.c deleted: objs/exec/redirect_dless.d
Norme: ./src/line_editing/print_and_del.c deleted: objs/exec/redirect_great.d
Norme: ./src/main/data_singleton.c deleted: objs/exec/redirect_greatand.d
Norme: ./src/line_editing/move_to_word.c deleted: objs/exec/redirect_less.d
Norme: ./src/main/data_init.c deleted: objs/exec/redirect_lessand.d
Error (line 15, col 14): global named environ is not well prefixed deleted: objs/exec/set_exitstatus.d
Error (line 46): function data_init has 30 lines deleted: objs/exec/token_to_argv.d
Error (line 68): comment not well formatted deleted: objs/glob/command_getoutput.d
Error (line 68): bad indentation deleted: objs/glob/dir_glob.d
Error (line 68): comment not well placed deleted: objs/glob/esc_print.d
Error (line 70): comment not well formatted deleted: objs/glob/expand_bquote.d
Error (line 70): comment not well placed deleted: objs/glob/expand_brace.d
Norme: ./src/main/main.c deleted: objs/glob/expand_esc.d
Norme: ./src/parser/add_bang.c deleted: objs/glob/expand_home.d
Norme: ./src/main/ft_putast.c deleted: objs/glob/expand_var.d
Error (line 15): function ft_putast has 83 lines deleted: objs/glob/ft_strsplit_esc.d
Error (line 15): declarations must be followed by one empty line in ft_putast deleted: objs/glob/ft_strsplit_spe.d
Error (line 19): spaces at the end of line deleted: objs/glob/gen_tab_esc.d
Error (line 52, col 21): missing space around == deleted: objs/glob/glob.d
Norme: ./src/main/shell_init.c deleted: objs/glob/is_char_esc.d
Error (line 31): function get_input_fd has 30 lines deleted: objs/glob/lib_perso/ft_ld_back.d
Norme: ./src/parser/add_case.c deleted: objs/glob/lib_perso/ft_ld_clear.d
Norme: ./src/parser/add_cmd.c deleted: objs/glob/lib_perso/ft_ld_copy.d
Norme: ./src/parser/add_condition.c deleted: objs/glob/lib_perso/ft_ld_del.d
Norme: ./src/parser/add_number.c deleted: objs/glob/lib_perso/ft_ld_front.d
Norme: ./src/parser/add_loop.c deleted: objs/glob/lib_perso/ft_ld_new.d
Norme: ./src/parser/add_sep.c deleted: objs/glob/lib_perso/ft_ld_order.d
Norme: ./src/parser/add_func.c deleted: objs/glob/lib_perso/ft_ld_pushback.d
Error (line 97, col 3): missing space after break deleted: objs/glob/lib_perso/ft_ld_pushfront.d
Error (line 100): spaces at the end of line deleted: objs/glob/lib_perso/ft_ld_reverse.d
Error (line 120): must begin only by tabulations deleted: objs/glob/lib_perso/ft_ld_size.d
Norme: ./src/parser/add_subshell.c deleted: objs/glob/lib_perso/ft_ld_swap.d
Norme: ./src/parser/do_parser_routine.c deleted: objs/glob/lib_perso/ft_ld_to_tab.d
Norme: ./src/parser/build_tree.c deleted: objs/glob/lib_perso/ft_memrealloc.d
Norme: ./src/parser/error_syntax.c deleted: objs/glob/lib_perso/ft_strjoinf.d
Norme: ./src/parser/add_redir.c deleted: objs/glob/lib_perso/ft_strsubf.d
Norme: ./src/parser/heredoc_parser.c deleted: objs/glob/lib_perso/ft_tabdel.d
Norme: ./src/parser/ft_parse.c deleted: objs/glob/lib_perso/ft_tablen.d
Norme: ./src/parser/parser_init.c deleted: objs/glob/match_pattern.d
Norme: ./src/parser/parser_destroy.c deleted: objs/glob/tab_esc_copy.d
Norme: ./src/parser/pop_stack.c deleted: objs/glob/word_is_assignment.d
Norme: ./src/parser/push_stack.c deleted: objs/hash_table/ft_add_hash.d
Norme: ./src/parser/redir_init.c deleted: objs/hash_table/hash.d
Norme: ./src/parser/stack_init.c deleted: objs/hash_table/hash_free.d
Norme: ./src/parser/sym_free.c deleted: objs/hash_table/hash_str.d
Norme: ./src/parser/tree_func_free.c deleted: objs/hash_table/is_hash.d
Norme: ./src/parser/tree_wrapper.c deleted: objs/history/add_str_in_history.d
Norme: ./src/parser/produce_sym.c deleted: objs/history/history.d
Norme: ./src/parser/aggregate_sym.c deleted: objs/history/history_parsing.d
Norme: ./src/parser/eval_sym.c deleted: objs/history/history_parsing_toolz.d
deleted: objs/history/history_parsing_toolz_2.d
deleted: objs/history/list_toolz.d
deleted: objs/history/surch_in_history.d
deleted: objs/job_control/builtin_bg.d
deleted: objs/job_control/builtin_fg.d
deleted: objs/job_control/builtin_jobs.d
deleted: objs/job_control/do_job_notification.d
deleted: objs/job_control/has_running_job.d
deleted: objs/job_control/has_stopped_job.d
deleted: objs/job_control/job_addprocess.d
deleted: objs/job_control/job_cmp_id.d
deleted: objs/job_control/job_format.d
deleted: objs/job_control/job_format_head.d
deleted: objs/job_control/job_free.d
deleted: objs/job_control/job_getprocess.d
deleted: objs/job_control/job_getrank.d
deleted: objs/job_control/job_hup_all.d
deleted: objs/job_control/job_is_completed.d
deleted: objs/job_control/job_is_stopped.d
deleted: objs/job_control/job_notify_change.d
deleted: objs/job_control/job_notify_new.d
deleted: objs/job_control/job_remove.d
deleted: objs/job_control/job_run.d
deleted: objs/job_control/job_update_id.d
deleted: objs/job_control/job_update_status.d
deleted: objs/job_control/job_wait.d
deleted: objs/job_control/mark_job_as_running.d
deleted: objs/job_control/pprint_brace.d
deleted: objs/job_control/pprint_case.d
deleted: objs/job_control/pprint_cmd.d
deleted: objs/job_control/pprint_for.d
deleted: objs/job_control/pprint_function.d
deleted: objs/job_control/pprint_if.d
deleted: objs/job_control/pprint_subshell.d
deleted: objs/job_control/pprint_until.d
deleted: objs/job_control/pprint_while.d
deleted: objs/job_control/process_cmp_pid.d
deleted: objs/job_control/process_format.d
deleted: objs/job_control/process_free.d
deleted: objs/job_control/put_job_in_background.d
deleted: objs/job_control/put_job_in_foreground.d
deleted: objs/job_control/sigchld_handler.d
deleted: objs/job_control/sigint_handler.d
deleted: objs/job_control/sigtstp_handler.d
deleted: objs/job_control/sigttin_handler.d
deleted: objs/job_control/sigttou_handler.d
deleted: objs/lexer/do_lexer_routine.d
deleted: objs/lexer/get_lexer_stack.d
deleted: objs/lexer/get_reserved_words.d
deleted: objs/lexer/get_state_global.d
deleted: objs/lexer/get_state_redir.d
deleted: objs/lexer/insert_newline.d
deleted: objs/lexer/isrw_delim.d
deleted: objs/lexer/keep_last_type.d
deleted: objs/lexer/lexer_backslash.d
deleted: objs/lexer/lexer_bquote.d
deleted: objs/lexer/lexer_curly_braces.d
deleted: objs/lexer/lexer_default.d
deleted: objs/lexer/lexer_delim.d
deleted: objs/lexer/lexer_destroy.d
deleted: objs/lexer/lexer_dquote.d
deleted: objs/lexer/lexer_end.d
deleted: objs/lexer/lexer_great.d
deleted: objs/lexer/lexer_heredoc.d
deleted: objs/lexer/lexer_init.d
deleted: objs/lexer/lexer_less.d
deleted: objs/lexer/lexer_lex.d
deleted: objs/lexer/lexer_newline.d
deleted: objs/lexer/lexer_number.d
deleted: objs/lexer/lexer_paren.d
deleted: objs/lexer/lexer_quote.d
deleted: objs/lexer/lexer_sep.d
deleted: objs/lexer/lexer_word.d
deleted: objs/lexer/token_append.d
deleted: objs/lexer/token_cmp_type.d
deleted: objs/lexer/token_free.d
deleted: objs/lexer/token_init.d
deleted: objs/lexer/token_print.d
deleted: objs/line_editing/completion.d
deleted: objs/line_editing/control_features.d
deleted: objs/line_editing/copy_cut_paste.d
deleted: objs/line_editing/ft_prompt.d
deleted: objs/line_editing/get_key.d
deleted: objs/line_editing/home_end.d
deleted: objs/line_editing/init_history.d
deleted: objs/line_editing/init_line.d
deleted: objs/line_editing/init_termcaps.d
deleted: objs/line_editing/lib_line_editing/ft_nb_line.d
deleted: objs/line_editing/lib_line_editing/tool_line.d
deleted: objs/line_editing/lib_line_editing/tool_line_2.d
deleted: objs/line_editing/lib_line_editing/toolz.d
deleted: objs/line_editing/lib_line_editing/toolz2.d
deleted: objs/line_editing/lib_line_editing/toolz_parseur.d
deleted: objs/line_editing/lib_line_editing/toolz_termcaps.d
deleted: objs/line_editing/move_left_and_right.d
deleted: objs/line_editing/move_to_word.d
deleted: objs/line_editing/move_up_and_down.d
deleted: objs/line_editing/print_and_del.d
deleted: objs/line_editing/queue.d
deleted: objs/line_editing/readline.d
deleted: objs/line_editing/resize.d
deleted: objs/main/data_exit.d
deleted: objs/main/data_init.d
deleted: objs/main/data_singleton.d
deleted: objs/main/ft_putast.d
deleted: objs/main/main.d
deleted: objs/main/shell_init.d
deleted: objs/parser/add_bang.d
deleted: objs/parser/add_case.d
deleted: objs/parser/add_cmd.d
deleted: objs/parser/add_condition.d
deleted: objs/parser/add_func.d
deleted: objs/parser/add_loop.d
deleted: objs/parser/add_number.d
deleted: objs/parser/add_redir.d
deleted: objs/parser/add_sep.d
deleted: objs/parser/add_subshell.d
deleted: objs/parser/aggregate_sym.d
deleted: objs/parser/build_tree.d
deleted: objs/parser/do_parser_routine.d
deleted: objs/parser/error_syntax.d
deleted: objs/parser/eval_sym.d
deleted: objs/parser/ft_parse.d
deleted: objs/parser/heredoc_parser.d
deleted: objs/parser/parser_destroy.d
deleted: objs/parser/parser_init.d
deleted: objs/parser/pop_stack.d
deleted: objs/parser/produce_sym.d
deleted: objs/parser/push_stack.d
deleted: objs/parser/read_stack.d
deleted: objs/parser/redir_init.d
deleted: objs/parser/stack_init.d
deleted: objs/parser/sym_free.d
deleted: objs/parser/tree_func_free.d
deleted: objs/parser/tree_wrapper.d
modified: src/parser/add_bang.c
modified: src/parser/add_case.c
modified: src/parser/add_condition.c
modified: src/parser/add_loop.c
modified: src/parser/add_number.c
modified: src/parser/add_sep.c
modified: src/parser/add_subshell.c
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: log

2
42sh/src/completion/c_find_files.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:31:21 by alao #+# #+# */ /* Created: 2017/01/09 13:31:21 by alao #+# #+# */
/* Updated: 2017/03/22 12:57:02 by gwojda ### ########.fr */ /* Updated: 2017/03/22 16:02:18 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

57
42sh/src/completion/c_match.c
View file

@ -6,33 +6,59 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/10/15 13:27:14 by alao #+# #+# */ /* Created: 2016/10/15 13:27:14 by alao #+# #+# */
/* Updated: 2017/03/22 15:13:12 by gwojda ### ########.fr */ /* Updated: 2017/03/22 16:02:25 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static int c_is_delim(char c)
{
if (c == ' ' || c == '<' || c == '>' || c == '\n' || c == ';')
return (1);
return (0);
}
static char *c_strdupi(char *s, int (*f)(char))
{
int i;
char *str;
i = 0;
while (s[i] && !(*f)(s[i]))
i++;
str = (char *)ft_malloc(sizeof(char) * (i + 1));
if (str)
{
str[i--] = '\0';
while (i >= 0)
{
str[i] = s[i];
i--;
}
}
return (str);
}
/* /*
** Seek the current word. ** Seek the current word.
*/ */
static char *c_current_words(t_comp *c) static char *c_current_words(void)
{ {
size_t pos; size_t pos;
char *str; char *str;
(void)c;
pos = data_singleton()->line.pos; pos = data_singleton()->line.pos;
str = data_singleton()->line.input; str = data_singleton()->line.input;
DG("pos = \"%zu\"", pos); if (pos && c_is_delim(str[pos]))
while (pos && str[pos] != ' ' && str[pos] != '<'
&& str[pos] != '>' && str[pos] != '\n' && str[pos] != ';')
--pos; --pos;
if (str[pos] == ' ' || str[pos] == '<' while (pos && !c_is_delim(str[pos]))
|| str[pos] == '>' || str[pos] == '\n' || str[pos] == ';') --pos;
if (c_is_delim(str[pos]))
++pos; ++pos;
DG("pos = \"%zu\"", pos); return (c_strdupi(str + pos, &c_is_delim));
return (str + pos);
} }
/* /*
@ -43,17 +69,16 @@ int c_matching(t_data *s, t_comp *c)
{ {
char *current_word; char *current_word;
DG("c->rcmd = \"%s\"", c->rcmd); current_word = c_current_words();
current_word = c_current_words(c); if (ft_strchr(current_word, '/'))
DG("current_word = \"%s\"", current_word);
if (ft_strchr(c->rcmd, '/'))
c_seek_abs_path(c, current_word); c_seek_abs_path(c, current_word);
else if (ft_strchr(c->rcmd, '$')) else if (ft_strchr(current_word, '$'))
c_seek_env(c, current_word); c_seek_env(c, current_word);
else if (c->rcmd[0] != '.' && !(ft_strchr(c->rcmd, ' '))) else if (current_word[0] != '.' && !(ft_strchr(c->rcmd, ' ')))
c_seek_binary(s, c); c_seek_binary(s, c);
else else
c_seek_files(s, c, current_word); c_seek_files(s, c, current_word);
ft_strdel(&current_word);
if (s->comp && s->comp->lst) if (s->comp && s->comp->lst)
{ {
c_sizing(c); c_sizing(c);

11
42sh/src/exec/plaunch_for.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */ /* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/15 00:49:20 by wescande #+# #+# */ /* Created: 2017/03/15 00:49:20 by wescande #+# #+# */
/* Updated: 2017/03/21 00:51:01 by wescande ### ########.fr */ /* Updated: 2017/03/22 15:51:04 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,10 +23,7 @@ int plaunch_for(t_process *p)
var = ((char **)temp->content)[0]; var = ((char **)temp->content)[0];
if (!word_is_assignment(temp->content)) if (!word_is_assignment(temp->content))
return (error_badidentifier(var)); return (error_badidentifier(var));
temp = temp->next; i = 0;
while (temp)
{
i = -1;
av = token_to_argv(temp, 1); av = token_to_argv(temp, 1);
while (av[++i]) while (av[++i])
{ {
@ -34,7 +31,7 @@ int plaunch_for(t_process *p)
NULL); NULL);
ft_exec(&p->data.d_for.content); ft_exec(&p->data.d_for.content);
} }
temp = temp->next; ft_tabdel(&av);
} sleep(10);
return (0); return (0);
} }

2
42sh/src/parser/eval_sym.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/11 16:11:21 by ariard #+# #+# */ /* Created: 2017/03/11 16:11:21 by ariard #+# #+# */
/* Updated: 2017/03/18 15:51:55 by ariard ### ########.fr */ /* Updated: 2017/03/22 16:11:11 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

16
42sh/src/parser/produce_sym.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 17:58:34 by ariard #+# #+# */ /* Created: 2017/02/09 17:58:34 by ariard #+# #+# */
/* Updated: 2017/03/17 18:09:37 by ariard ### ########.fr */ /* Updated: 2017/03/22 16:10:09 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -35,7 +35,6 @@ t_prodmatch g_prodmatch[] =
{TK_WORD, TK_WHILE, CMD_NAME}, {TK_WORD, TK_WHILE, CMD_NAME},
{TK_WORD, TK_UNTIL, CMD_NAME}, {TK_WORD, TK_UNTIL, CMD_NAME},
{TK_WORD, TK_DO, CMD_NAME}, {TK_WORD, TK_DO, CMD_NAME},
{TK_WORD, TK_PAREN_CLOSE, CMD_NAME},
{TK_WORD, TK_RBRACE, CMD_NAME}, {TK_WORD, TK_RBRACE, CMD_NAME},
{TK_WORD, TK_IF, CMD_NAME}, {TK_WORD, TK_IF, CMD_NAME},
{TK_WORD, TK_THEN, CMD_NAME}, {TK_WORD, TK_THEN, CMD_NAME},
@ -69,9 +68,16 @@ t_prodmatch g_prodmatch[] =
{TK_ASSIGNMENT_WORD, TK_ELIF, CMD_PREFIX}, {TK_ASSIGNMENT_WORD, TK_ELIF, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, TK_ELSE, CMD_PREFIX}, {TK_ASSIGNMENT_WORD, TK_ELSE, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, NEWLINE_LIST, CMD_PREFIX}, {TK_ASSIGNMENT_WORD, NEWLINE_LIST, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, CMD_NAME, CMD_SUFFIX}, {TK_ASSIGNMENT_WORD, CMD_NAME, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, CMD_SUPERIOR, CMD_SUFFIX}, {TK_ASSIGNMENT_WORD, CMD_SUPERIOR, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, PIPE_SEMI_SEQUENCE, CMD_SUFFIX}, {TK_ASSIGNMENT_WORD, COMPOUND_LIST, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, COMPLETE_CONDITION, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, CONDITION, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, AND_OR, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, AND_OR_MAJOR, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, PIPE_SEMI_SEQUENCE, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, SEQUENCE, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, COMPLETE_COMMANDS, CMD_PREFIX},
{TK_ASSIGNMENT_WORD, CMD_WORD, CMD_SUFFIX}, {TK_ASSIGNMENT_WORD, CMD_WORD, CMD_SUFFIX},
{TK_NAME, TK_BANG, FNAME}, {TK_NAME, TK_BANG, FNAME},
{TK_NAME, LINEBREAK, FNAME}, {TK_NAME, LINEBREAK, FNAME},