Dev (#2)
* 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
This commit is contained in:
@@ -5,18 +5,35 @@
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2019/01/13 16:20:20 by tmaze #+# #+# */
|
||||
/* Updated: 2019/01/13 17:05:05 by tmaze ### ########.fr */
|
||||
/* Created: 2019/09/20 14:41:08 by tmaze #+# #+# */
|
||||
/* Updated: 2019/11/10 21:38:30 by tmaze ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
|
||||
int cmd_setenv(char **argv, t_list **env)
|
||||
int cmd_setenv(char **argv, t_env **env)
|
||||
{
|
||||
if (argv[1] == NULL)
|
||||
return (-1);
|
||||
if (env_addupdate(argv[1], argv[2], env) == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
t_env *new;
|
||||
t_env *tmp;
|
||||
|
||||
if (argv[1] && (new = ft_envnew(argv[1])) != NULL)
|
||||
{
|
||||
if (argv[1] && (tmp = ft_envgetelem(new->key, *env)) != NULL)
|
||||
{
|
||||
ft_strdel(&(tmp->val));
|
||||
tmp->val = new->val;
|
||||
ft_strdel(&(new->key));
|
||||
ft_memdel((void**)&new);
|
||||
}
|
||||
else
|
||||
ft_envaddend(env, new);
|
||||
ft_envclean(env);
|
||||
return (0);
|
||||
}
|
||||
else if (argv[1] && argv[1][0] != '=' && !ft_strchr(argv[1], '='))
|
||||
ft_printf("minishell: setenv: memory error\n");
|
||||
else
|
||||
ft_printf("usage: setenv [KEY]=[value]\n");
|
||||
return (1);
|
||||
}
|
||||
|
Reference in New Issue
Block a user