2a2f5bd4d3
* Restart from scratch
branched out on dev
removed all previous source files
started test on new env2lst function
* norm: splitted functions in main into appropriate file
Moved lstdelenvelem & env2lst to ms_env.c
Normed out files
* Feat(WIP): Added possibility to cmd_env to execute commands with
altered env.
Added dummy function for cd, echo, setenv & unsetenv
Started work on env copy feature
* feature: switched env from ft_list to specific list
* feature: added execution of commands from path
* feature: added env, setenv & unsetenv builtins
added -i option & command execution to env
added setenv & unsetenv builtins
* Clean-up: normed out files
* Changed comportment on error for check_path functions
* feature: added completion for ~ and ${}
WIP leaks detected on ${} completion
* fix leak on ext need test
* feature: added echo cmd
changed printf ref to ft_printf
* feature: add cd built-in
* Simple norm-out
* moved env functions to libft
* fixed out-of-memory access in extension
* Resolved infinite loop in extension revolving
WIP norming in cd
* Normedout cmd_cd.c
* Normed out functions in cmd_cd
* Normed out funtions
sorting out needed
* removed -fsanitize from Makefile
* corrected env -i crash & SHLVL
* Delete norm.txt
* added put_error_cd2 in put_error_cd.c
* added inline environment
96 lines
2.3 KiB
C
96 lines
2.3 KiB
C
/* ************************************************************************** */
|
|
/* */
|
|
/* ::: :::::::: */
|
|
/* cmd_env.c :+: :+: :+: */
|
|
/* +:+ +:+ +:+ */
|
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
/* +#+#+#+#+#+ +#+ */
|
|
/* Created: 2019/09/20 14:33:48 by tmaze #+# #+# */
|
|
/* Updated: 2020/01/30 15:41:08 by tmaze ### ########.fr */
|
|
/* */
|
|
/* ************************************************************************** */
|
|
|
|
#include "minishell.h"
|
|
|
|
static void put_env(t_env *env)
|
|
{
|
|
t_env *it;
|
|
|
|
it = env;
|
|
while (it)
|
|
{
|
|
ft_printf("%s=", it->key);
|
|
if (it->val)
|
|
ft_printf("%s", it->val);
|
|
ft_putchar('\n');
|
|
it = it->next;
|
|
}
|
|
}
|
|
|
|
t_env *envcpy(t_env *env)
|
|
{
|
|
t_env *cpy;
|
|
|
|
cpy = NULL;
|
|
if (env != NULL && (cpy = (t_env*)ft_memalloc(sizeof(t_env))) != NULL)
|
|
if ((cpy->key = ft_strdup(env->key)) == NULL
|
|
|| (cpy->val = ft_strdup(env->val)) == NULL)
|
|
ft_envdelelem(&cpy);
|
|
return (cpy);
|
|
}
|
|
|
|
int env_cleanup(t_env *env_cp, int code)
|
|
{
|
|
ft_envdel(&env_cp);
|
|
if (code == 2)
|
|
ft_putstr_fd("minishell: env: Env copy error\n", 2);
|
|
return (code);
|
|
}
|
|
|
|
t_env *inline_env(char **argv, int *i, t_env **env_cp)
|
|
{
|
|
t_env *new;
|
|
|
|
while (ft_strchr(argv[*i], '='))
|
|
{
|
|
if ((new = ft_envnew(argv[*i])) == NULL)
|
|
{
|
|
ft_printf("env: memory error\n");
|
|
ft_envdel(env_cp);
|
|
break ;
|
|
}
|
|
ft_envaddend(env_cp, new);
|
|
(*i)++;
|
|
}
|
|
return (*env_cp);
|
|
}
|
|
|
|
int cmd_env(char **argv, t_env **env)
|
|
{
|
|
int i;
|
|
t_env *it;
|
|
t_env *new;
|
|
t_env *env_cp;
|
|
|
|
i = 1;
|
|
if (!(env_cp = NULL) && !ft_strequ(argv[i], "-i") && (env != NULL))
|
|
{
|
|
it = *env;
|
|
while (it)
|
|
{
|
|
if ((new = envcpy(it)) == NULL)
|
|
return (env_cleanup(env_cp, 2));
|
|
ft_envaddend(&env_cp, new);
|
|
it = it->next;
|
|
}
|
|
}
|
|
else if (ft_strequ(argv[i], "-i"))
|
|
i++;
|
|
inline_env(argv, &i, &env_cp);
|
|
if (argv[i])
|
|
exec_cmd(argv + i, &env_cp);
|
|
else
|
|
put_env(env_cp);
|
|
return (env_cleanup(env_cp, 0));
|
|
}
|