diff --git a/minishell/file b/minishell/file new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/minishell/file @@ -0,0 +1 @@ +test diff --git a/minishell/srcs/execution/builtins/cd/cd.c b/minishell/srcs/execution/builtins/cd/cd.c index 8d767ec..3f2e143 100644 --- a/minishell/srcs/execution/builtins/cd/cd.c +++ b/minishell/srcs/execution/builtins/cd/cd.c @@ -19,7 +19,7 @@ int sub_execute_cd_args(t_cmd_elem *elem, t_mem *mem, char *current_path) new_pwd = NULL; if (chdir(elem->args[1]) == -1) { - ft_putstr_fd("bash: cd: ", 2); + ft_putstr_fd("minishell: cd: ", 2); ft_putstr_fd(elem->args[1], 2); ft_putstr_fd(": No such file or directory\n", 2); push_ret_elem(mem, 127); @@ -45,7 +45,7 @@ int execute_cd_args(t_cmd_elem *elem, t_mem *mem, char *current_path) ret = 0; new_pwd = NULL; if (elem->args_len > 2) - return (d_err_p_ret("bash: cd: too many arguments\n", mem, 1, 2)); + return (d_err_p_ret("minishell: cd: too many arguments\n", mem, 1, 2)); if (elem->args[1][0] != '-') return (sub_execute_cd_args(elem, mem, current_path)); else diff --git a/minishell/srcs/execution/builtins/exit/exit.c b/minishell/srcs/execution/builtins/exit/exit.c index 1d2a139..5af7b12 100644 --- a/minishell/srcs/execution/builtins/exit/exit.c +++ b/minishell/srcs/execution/builtins/exit/exit.c @@ -120,6 +120,6 @@ int ft_exec_exit(t_cmd_elem *e, t_mem *m) } } if (e && e->args_len > 2 && !enter) - return (d_err_p_ret("bash: exit: too many arguments\n", m, 1, 2)); + return (d_err_p_ret("minishell: exit: too many arguments\n", m, 1, 2)); return (exit_clean(e, ret, m)); } diff --git a/minishell/srcs/execution/redirections/find_exec.c b/minishell/srcs/execution/redirections/find_exec.c index 78c1b10..068f443 100644 --- a/minishell/srcs/execution/redirections/find_exec.c +++ b/minishell/srcs/execution/redirections/find_exec.c @@ -75,7 +75,7 @@ char *find_exec(t_cmd_elem *elem, t_mem *mem) fd = open(s, O_RDONLY, 0644); if (fd < 0) { - ft_putstr_fd("bash: ", 2); + ft_putstr_fd("minishell: ", 2); ft_putstr_fd(s, 2); ft_putstr_fd(": No such file or directory\n", 2); push_ret_elem(mem, 127); diff --git a/minishell/srcs/execution/redirections/heredoc.c b/minishell/srcs/execution/redirections/heredoc.c index dcb85b1..b7d31a8 100644 --- a/minishell/srcs/execution/redirections/heredoc.c +++ b/minishell/srcs/execution/redirections/heredoc.c @@ -39,7 +39,7 @@ void loop_heredoc(char *line, t_mem *mem, t_file_elem *f, int *heredoc_pipe) line = readline("> "); if (!line) { - ft_putstr_fd("bash: avertissement : « here-document »\n", 2); + ft_putstr_fd("minishell: avertissement : « here-document »\n", 2); break ; } if (!ft_strcmp(line, f->path)) diff --git a/minishell/srcs/execution/redirections/redirections.c b/minishell/srcs/execution/redirections/redirections.c index 0f0d8b8..475f89a 100644 --- a/minishell/srcs/execution/redirections/redirections.c +++ b/minishell/srcs/execution/redirections/redirections.c @@ -50,7 +50,7 @@ int redir_input_simple(t_cmd_elem *elem, t_mem *mem) f->fd = open(f->path, O_RDONLY); if (f->fd < 0) { - ft_putstr_fd("bash: ", 2); + ft_putstr_fd("minishell: ", 2); ft_putstr_fd(f->path, 2); ft_putstr_fd(": No such file or directory\n", 2); push_ret_elem(mem, 127); diff --git a/minishell/srcs/parsing/parse_main.c b/minishell/srcs/parsing/parse_main.c index f764a70..ba6e5bc 100644 --- a/minishell/srcs/parsing/parse_main.c +++ b/minishell/srcs/parsing/parse_main.c @@ -85,10 +85,7 @@ int parse_line(t_mem *m) else if (m->line[(p.i)++]) (*m->buffer) = copy_in_buffer((*m->buffer), m->line[p.i - 1], m); if (p.error) - { - d_err_p_ret("inishell: parse error\n", m, 2, 2); return (-1); - } } end_arg(m->buffer, p.e, m, &p.r_type); if (check_parsing_end_conditions(m, &ret) < 0) diff --git a/minishell/srcs/parsing/parse_main_utils.c b/minishell/srcs/parsing/parse_main_utils.c index afbd847..41be9fb 100644 --- a/minishell/srcs/parsing/parse_main_utils.c +++ b/minishell/srcs/parsing/parse_main_utils.c @@ -17,7 +17,6 @@ int check_parsing_end_conditions(t_mem *mem, int *ret) *ret = 1; if (check_cmd(mem->cmd) == -1) { - ft_putstr_fd("Parse error.\n", 2); push_ret_elem(mem, 2); *ret = -1; } @@ -70,13 +69,12 @@ int check_file(t_mem *mem) file_elem = elem->file->first; if (elem->redir_type != R_NONE && !file_elem) { - ft_putstr_fd("minishell: parse error\n", 2); push_ret_elem(mem, 1); return (-1); } else if (elem->redir_type != R_NONE && !ft_strcmp(file_elem->path, "")) { - ft_putstr_fd("bash: No such file or directory\n", 2); + ft_putstr_fd("minishell: No such file or directory\n", 2); push_ret_elem(mem, 127); return (-2); } diff --git a/minishell/srcs/utils/error/error.c b/minishell/srcs/utils/error/error.c index c9dc2e1..9ba677d 100644 --- a/minishell/srcs/utils/error/error.c +++ b/minishell/srcs/utils/error/error.c @@ -31,7 +31,7 @@ int d2_err_p_ret(char *error, char *arg, t_mem *mem, int ret) int d3_err(char *error, char *arg, t_mem *mem, int ret) { - ft_putstr_fd("bash: ", 2); + ft_putstr_fd("minishell: ", 2); ft_putstr_fd(arg, 2); ft_putstr_fd(error, 2); push_ret_elem(mem, ret); @@ -40,7 +40,7 @@ int d3_err(char *error, char *arg, t_mem *mem, int ret) int d4_err_p_ret(char *error, char *arg, t_mem *mem, int ret) { - ft_putstr_fd("bash: exit: ", 2); + ft_putstr_fd("minishell: exit: ", 2); ft_putstr_fd(arg, 2); ft_putstr_fd(error, 2); push_ret_elem(mem, ret); @@ -49,7 +49,7 @@ int d4_err_p_ret(char *error, char *arg, t_mem *mem, int ret) int d5_err_p_ret(char *error, char *arg, t_mem *mem, int ret) { - ft_putstr_fd("bash: export: `", 2); + ft_putstr_fd("minishell: export: `", 2); ft_putstr_fd(arg, 2); ft_putstr_fd(error, 2); push_ret_elem(mem, ret);