tvdu29/minishell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Feat(WIP): Added possibility to cmd_env to execute commands with

Browse Source 
altered env.

Added dummy function for cd, echo, setenv & unsetenv
Started work on env copy feature
This commit is contained in:
Tanguy MAZE
2019-09-20 15:49:38 +02:00
parent cf62dae53b
commit 05d8424f75
9 changed files with 220 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
srcs/main.c
View File

@@ -6,32 +6,22 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/09/19 17:08:46 by tmaze #+# #+# */
/* Updated: 2019/09/20 11:58:04 by tmaze ### ########.fr */
/* Updated: 2019/09/20 14:49:03 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void put_env(t_list *env)
{
t_list *it;
it = env;
while (it)
{
ft_printf("%s=", ((char**)it->content)[0]);
if (((char**)it->content)[1])
ft_printf("%s", ((char**)it->content)[1]);
ft_putchar('\n');
it = it->next;
}
}
int main(void)
{
extern char **environ;
t_list *env;
char *cmd;
extern char **environ;
static t_builtin built[S_BIN] = {{"env", &cmd_env}, {"cd", &cmd_cd}
, {"setenv", &cmd_setenv}, {"echo", &cmd_echo}
, {"unsetenv", &cmd_unsetenv}};
char **argv;
t_list *env;
char *cmd;
int i;
env = NULL;
if ((env = env2lst(environ)) == NULL)
@@ -40,15 +30,36 @@ int main(void)
{
cmd = NULL;
ft_printf("%s$>%s ", FT_COLOR_GREEN, FT_RESET);
if (ft_getline(&cmd) >= 0)
if (ft_getline(&cmd) >= 0 && cmd != NULL
&& (argv = ft_strsplit(cmd, ' ')) != NULL)
{
ft_printf("%s\n", cmd);
if (ft_strequ(cmd, "env"))
put_env(env);
ft_strdel(&cmd);
if (ft_strequ(argv[0], "exit"))
{
ft_del_words_tables(&argv);
ft_lstdel(&env, &lstdelenvelem);
return (0);
}
i = 0;
while (i < S_BIN)
{
if (ft_strequ(argv[0], built[i].cmd))
{
built[i].f(argv, &env);
break ;
}
i++;
}
if (i == S_BIN)
{
// exec cmd
ft_printf("exec %s...\n", argv[0]);
}
}
ft_strdel(&cmd);
break ;
ft_del_words_tables(&argv);
}
ft_del_words_tables(&argv);
ft_strdel(&cmd);
ft_lstdel(&env, &lstdelenvelem);
return (0);
}