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
118 lines
3.0 KiB
C
118 lines
3.0 KiB
C
/* ************************************************************************** */
|
|
/* */
|
|
/* ::: :::::::: */
|
|
/* ms_ext.c :+: :+: :+: */
|
|
/* +:+ +:+ +:+ */
|
|
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
|
/* +#+#+#+#+#+ +#+ */
|
|
/* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */
|
|
/* Updated: 2020/01/30 15:42:17 by tmaze ### ########.fr */
|
|
/* */
|
|
/* ************************************************************************** */
|
|
|
|
#include "minishell.h"
|
|
|
|
void *return_null(char *msg)
|
|
{
|
|
ft_printf("%s\n", msg);
|
|
return (NULL);
|
|
}
|
|
|
|
void ft_strreplace(char **dst, char *src, int *index, t_env *elem)
|
|
{
|
|
if (*dst != NULL)
|
|
ft_strdel(dst);
|
|
*dst = src;
|
|
*index = ft_strlen(elem->val);
|
|
}
|
|
|
|
t_env *search_key(t_env *env, char *cmd, int index)
|
|
{
|
|
t_env *it;
|
|
t_env *ret;
|
|
int i;
|
|
int j;
|
|
|
|
it = env;
|
|
ret = NULL;
|
|
while (it && cmd[index + 1])
|
|
{
|
|
i = 0;
|
|
j = index;
|
|
while (it->key[i] && cmd[j] && it->key[i] == cmd[j])
|
|
{
|
|
i++;
|
|
j++;
|
|
}
|
|
if (!it->key[i] && (!ret || ft_strlen(it->key) > ft_strlen(ret->key)))
|
|
ret = it;
|
|
it = it->next;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
char *replace_env(char *src, t_env *elem, int key_size, int i)
|
|
{
|
|
char *ret;
|
|
int res_len;
|
|
|
|
res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
|
|
ft_printf("size replace: %d\n", res_len);
|
|
if ((ret = ft_strnew(res_len)) != NULL)
|
|
{
|
|
ft_strncpy(ret, src, i);
|
|
ft_strlcat(ret, elem->val, res_len + 1);
|
|
ft_strlcat(ret, src + key_size, res_len + 1);
|
|
}
|
|
else
|
|
ft_printf("minishell: memory error\n");
|
|
return (ret);
|
|
}
|
|
|
|
char *resolve_complete_key(char **src, int *index, t_env *env)
|
|
{
|
|
t_env *tmp;
|
|
char *ret;
|
|
|
|
if ((tmp = search_key(env, *src, *index + 1)) != NULL)
|
|
{
|
|
if ((ret = replace_env(*src, tmp, ft_strlen(tmp->key)
|
|
+ 1, *index)) != NULL)
|
|
{
|
|
ft_strreplace(src, ret, index, tmp);
|
|
return (*src);
|
|
}
|
|
else
|
|
return (return_null("minishell: memory error"));
|
|
}
|
|
else
|
|
return (return_null("minishell: variable not found"));
|
|
}
|
|
|
|
char **res_ext(char **av, t_env *env)
|
|
{
|
|
int i[2];
|
|
t_env *tmp;
|
|
char *ret;
|
|
|
|
i[0] = -1;
|
|
while (av && av[++i[0]] && !(i[1] = 0))
|
|
{
|
|
while (av[i[0]][i[1]])
|
|
{
|
|
if (av[i[0]][i[1]] != '$' && av[i[0]][i[1]] != '~')
|
|
i[1]++;
|
|
else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
|
|
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[1])) != NULL)
|
|
ft_strreplace(&av[i[0]], ret, &i[1], tmp);
|
|
else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
|
|
== NULL)
|
|
return (return_null("Entry HOME not found\n"));
|
|
else if (av[i[0]][i[1]] == '$'
|
|
&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
|
|
return (NULL);
|
|
}
|
|
}
|
|
return (av);
|
|
}
|