tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed hell

Browse Source
This commit is contained in:
tomoron
2024-05-06 14:29:15 +02:00
parent 855ba3f6f2
commit 444b84c541
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
srcs/exec_bonus.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
/* Updated: 2024/05/06 10:24:38 by tomoron ### ########.fr */ /* Updated: 2024/05/06 14:25:19 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -80,9 +80,11 @@ void exec_command(t_msh *msh, int i, int cmd_count)
msh->fds[i] = ft_calloc(2, sizeof(int *)); msh->fds[i] = ft_calloc(2, sizeof(int *));
if (!msh->fds[i]) if (!msh->fds[i])
ft_exit(msh, 1); ft_exit(msh, 1);
if (msh->tokens && !cmd_is_builtin(msh, msh->tokens->value)) if (msh->tokens && !cmd_is_builtin(msh, msh->tokens->value)
&& msh->in_fd != -1)
get_cmd_path(msh); get_cmd_path(msh);
if ((msh->tokens && msh->tokens->value) || is_parenthesis(msh->cmds)) if (((msh->tokens && msh->tokens->value) || is_parenthesis(msh->cmds))
&& msh->in_fd != -1)
exec(msh, get_cmd_args(msh), i, cmd_count); exec(msh, get_cmd_args(msh), i, cmd_count);
else else
{ {

6
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
/* Updated: 2024/05/06 13:14:50 by tomoron ### ########.fr */ /* Updated: 2024/05/06 14:25:27 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -32,12 +32,12 @@ char *get_prompt(t_env *env)
res = ft_strjoin_free(res, "\033[1m\002", 1); res = ft_strjoin_free(res, "\033[1m\002", 1);
cwd = getcwd(cwd_buffer, 99); cwd = getcwd(cwd_buffer, 99);
if (cwd && ft_get_env(env, "HOME") && !ft_strncmp(cwd_buffer, if (cwd && ft_get_env(env, "HOME") && !ft_strncmp(cwd_buffer,
ft_get_env(env,"HOME"), ft_strlen(ft_get_env(env, "HOME")))) ft_get_env(env, "HOME"), ft_strlen(ft_get_env(env, "HOME"))))
{ {
cwd += ft_strlen(getenv("HOME")) - 1; cwd += ft_strlen(getenv("HOME")) - 1;
cwd[0] = '~'; cwd[0] = '~';
} }
if(cwd) if (cwd)
res = ft_strjoin_free(res, cwd, 1); res = ft_strjoin_free(res, cwd, 1);
res = ft_strjoin_free(res, "\001\033[0m\002$ ", 1); res = ft_strjoin_free(res, "\001\033[0m\002$ ", 1);
return (res); return (res);

13
srcs/minishell.h
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
/* Updated: 2024/05/06 10:57:52 by tomoron ### ########.fr */ /* Updated: 2024/05/06 14:27:14 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -82,19 +82,20 @@ extern int g_return_code;
int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc); int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc);
int add_var_to_str(char *res, char **command, t_env *env, int dquote); int add_var_to_str(char *res, char **command, t_env *env, int dquote);
int get_variable_expantion_len(char *command, t_env *env);
char *expand_variables(char *command, t_env *env, int *is_var);
t_env *export_set_env(t_env *env, char *name, char *value, int append); t_env *export_set_env(t_env *env, char *name, char *value, int append);
t_env *env_add_back(t_env *env, char *name, char *value, int empty);
void parent(t_msh *msh, int i, int cmd_count, char **cmd_args); void parent(t_msh *msh, int i, int cmd_count, char **cmd_args);
char *expand_variables(char *command, t_env *env, int *is_var);
t_token *expand_wildcards(t_token *res, char *value, int is_var); t_token *expand_wildcards(t_token *res, char *value, int is_var);
int check_tokens_syntax(t_cmd *cmd, t_cmd *last, t_env *env); int check_tokens_syntax(t_cmd *cmd, t_cmd *last, t_env *env);
t_token *token_add_back(t_token *res, char *token, int is_var); t_token *token_add_back(t_token *res, char *token, int is_var);
int recursive_filename_check(char *wildcard, char **value); int recursive_filename_check(char *wildcard, char **value);
int get_variable_expantion_len(char *command, t_env *env);
t_cmd *cmd_add_back(t_cmd *res, char *cmd, t_cmd_type type); t_cmd *cmd_add_back(t_cmd *res, char *cmd, t_cmd_type type);
int get_var_len(char **command, t_env *env, int dquote);
void find_cmd_path(t_msh *msh, char **paths, int *found); void find_cmd_path(t_msh *msh, char **paths, int *found);
void redirect_output(t_msh *msh, int i, char **cmd_args); void redirect_output(t_msh *msh, int i, char **cmd_args);
void redirect_input(t_msh *msh, int i, char **cmd_args); void redirect_input(t_msh *msh, int i, char **cmd_args);
t_env *env_add_back(t_env *env, char *name, char *value, int empty);
void print_syntax_error_bonus(t_cmd *cmd, t_cmd *cmds); void print_syntax_error_bonus(t_cmd *cmd, t_cmd *cmds);
int filename_corresponds(char *wildcard, char *value); int filename_corresponds(char *wildcard, char *value);
void close_all_pipes(t_msh *msh, int cmd_count, int i); void close_all_pipes(t_msh *msh, int cmd_count, int i);
@ -117,8 +118,6 @@ char *ft_get_env(t_env *env, char *var_name);
int get_out_type(t_msh *msh, t_cmd *cmds); int get_out_type(t_msh *msh, t_cmd *cmds);
void handle_here_doc(t_msh *msh, char *eof); void handle_here_doc(t_msh *msh, char *eof);
void signal_handler_interactive(int signum); void signal_handler_interactive(int signum);
int get_token_len(char *cmd);
int get_var_len(char **command, t_env *env, int dquote);
void signal_handler_here_doc(int signum); void signal_handler_here_doc(int signum);
t_token *parsing_syntax_error(t_token *res); t_token *parsing_syntax_error(t_token *res);
int file_access(t_msh *msh, int *found); int file_access(t_msh *msh, int *found);
@ -157,8 +156,6 @@ void print_signaled(int status);
int is_input_type(t_cmd *cmd); int is_input_type(t_cmd *cmd);
char *remove_path(char *token); char *remove_path(char *token);
t_cmd *parsing_bonus(char *cmd); t_cmd *parsing_bonus(char *cmd);
t_token *free_token(t_token *cmd);
void exec_commands(t_msh *msh);
void free_env_cpy(t_env *env); void free_env_cpy(t_env *env);
char *get_var_name(char *str); char *get_var_name(char *str);
int exec_builtin(t_msh *msh); int exec_builtin(t_msh *msh);

4
srcs/path.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/21 21:47:15 by marde-vr #+# #+# */ /* Created: 2024/02/21 21:47:15 by marde-vr #+# #+# */
/* Updated: 2024/05/06 13:37:25 by tomoron ### ########.fr */ /* Updated: 2024/05/06 14:25:40 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -99,8 +99,6 @@ void get_cmd_path(t_msh *msh)
ft_printf_fd(2, "'': command not found\n"); ft_printf_fd(2, "'': command not found\n");
else else
ft_printf_fd(2, "%s: command not found\n", msh->tokens->value); ft_printf_fd(2, "%s: command not found\n", msh->tokens->value);
//free(msh->tokens->value);
//msh->tokens->value = 0;
g_return_code = 127; g_return_code = 127;
} }
} }