added first builtin
corrected binary execution + added echo
This commit is contained in:
48
srcs/main.c
48
srcs/main.c
@@ -6,12 +6,35 @@
|
||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2018/11/18 13:09:55 by tmaze #+# #+# */
|
||||
/* Updated: 2018/11/23 11:28:26 by tmaze ### ########.fr */
|
||||
/* Updated: 2018/11/27 17:52:17 by tmaze ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
|
||||
char **ft_strtabcpy(char **tab)
|
||||
{
|
||||
char **ret;
|
||||
size_t size_tab;
|
||||
|
||||
size_tab = 0;
|
||||
while (tab[size_tab])
|
||||
size_tab++;
|
||||
if ((ret = (char**)ft_memalloc(sizeof(char*) * size_tab)) == NULL)
|
||||
return (NULL);
|
||||
size_tab = 0;
|
||||
while (tab[size_tab])
|
||||
{
|
||||
if ((ret[size_tab] = ft_strdup(tab[size_tab])) == NULL)
|
||||
{
|
||||
ft_del_words_tables(&ret);
|
||||
break ;
|
||||
}
|
||||
size_tab++;
|
||||
}
|
||||
return (ret);
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
char *cmd;
|
||||
@@ -20,20 +43,24 @@ int main(void)
|
||||
int ret;
|
||||
extern char **environ;
|
||||
|
||||
if ((myenv = ft_memalloc(sizeof(environ))) == NULL)
|
||||
if ((myenv = ft_strtabcpy(environ)) == NULL)
|
||||
{
|
||||
ft_putendl("error alloc");
|
||||
return (2);
|
||||
}
|
||||
ft_memcpy((void*)myenv, (void*)environ, sizeof(environ));
|
||||
while (1)
|
||||
{
|
||||
ret = 0;
|
||||
ft_putstr(FT_COLOR_BLUE);
|
||||
ft_putstr(FT_COLOR_GREEN);
|
||||
ft_putstr("$> ");
|
||||
ft_putstr(FT_RESET);
|
||||
while (ret == 0)
|
||||
ret = get_next_line(0, &cmd);
|
||||
ret = get_next_line(1, &cmd);
|
||||
if (ret == -1)
|
||||
{
|
||||
ft_memdel((void*)&myenv);
|
||||
ft_strdel(&cmd);
|
||||
return (2);
|
||||
}
|
||||
if (ft_strcmp("exit", cmd) == 0)
|
||||
{
|
||||
ft_memdel((void*)&myenv);
|
||||
@@ -48,12 +75,7 @@ int main(void)
|
||||
return (2);
|
||||
}
|
||||
if ((ret = fork()) == 0)
|
||||
{
|
||||
execve(cmd, tab_cmd, environ);
|
||||
ft_putstr("Error: ");
|
||||
ft_putendl(cmd);
|
||||
exit(0);
|
||||
}
|
||||
exit(exec_cmd(tab_cmd, myenv));
|
||||
else
|
||||
{
|
||||
waitpid(ret, NULL, 0);
|
||||
@@ -62,5 +84,5 @@ int main(void)
|
||||
}
|
||||
}
|
||||
ft_strdel((void*)&myenv);
|
||||
return (3);
|
||||
return (0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user