starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: minishell rework

Browse Source
This commit is contained in:
Camille Chauvet 2023-02-21 15:32:22 +01:00
parent a20fa2a4c6
commit d7032849d6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.execution.c.swp
View File

Binary file not shown.

11
execution.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/21 12:45:16 by cchauvet #+# #+# */ /* Created: 2023/02/21 12:45:16 by cchauvet #+# #+# */
/* Updated: 2023/02/21 15:06:12 by cchauvet ### ########.fr */ /* Updated: 2023/02/21 15:31:02 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -20,6 +20,8 @@ static char *ft_get_executable_path(char *executable_name, t_list **env)
char **tab; char **tab;
size_t i; size_t i;
if (executable_name == NULL)
return (NULL);
path = NULL; path = NULL;
if (executable_name[0] == '.' || executable_name[0] == '/') if (executable_name[0] == '.' || executable_name[0] == '/')
{ {
@ -108,11 +110,12 @@ static int ft_own_cmd(t_list **env, t_cmd *cmd)
return_code = (move_folder(cmd->args[0], cmd->fd_out)); return_code = (move_folder(cmd->args[0], cmd->fd_out));
/* if (ft_strcmp(cmd->executable, "unset") == 0) */ /* if (ft_strcmp(cmd->executable, "unset") == 0) */
/* return_code = (unset(env, cmd->args, cmd->fd_out)); */ /* return_code = (unset(env, cmd->args, cmd->fd_out)); */
else if (ft_strcmp(cmd->executable, "echo") == 0) /* else if (ft_strcmp(cmd->executable, "echo") == 0) */
return_code = (echo(cmd->fd_out, cmd->args + 1)); /* return_code = (echo(cmd->fd_out, cmd->args + 1)); */
else if (ft_strcmp(cmd->executable, "exit") == 0) else if (ft_strcmp(cmd->executable, "exit") == 0)
return_code = -2; return_code = -2;
cmd->executable = NULL; if (return_code != -1)
cmd->executable = NULL;
return (return_code); return (return_code);
} }

4
minishell.h
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/14 13:45:30 by cchauvet #+# #+# */ /* Created: 2023/02/14 13:45:30 by cchauvet #+# #+# */
/* Updated: 2023/02/21 15:05:50 by cchauvet ### ########.fr */ /* Updated: 2023/02/21 15:10:50 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -60,7 +60,7 @@ char *get_value(char *str);
char *get_key(char *str); char *get_key(char *str);
/* Echo */ /* Echo */
int echo(int fd, char **args); int echo(int fd, char *str);
/* PWD */ /* PWD */
int pwd(int fd); int pwd(int fd);
char *get_pwd(int fd); char *get_pwd(int fd);