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

moved env functions to libft

Browse Source
This commit is contained in:
Tanguy Maze
2019-12-25 11:45:05 +01:00
parent 2362474fd6
commit 8a421600f4
18 changed files with 320 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/cmd_echo.c
View File

@@ -14,9 +14,9 @@
int cmd_echo(char **argv, t_env **env)
{
(void)env;
int i;
(void)env;
i = 1;
while (argv[i])
ft_printf("%s ", argv[i++]);

19
srcs/cmd_env.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/09/20 14:33:48 by tmaze #+# #+# */
/* Updated: 2019/11/08 21:55:51 by tmaze ### ########.fr */
/* Updated: 2019/12/09 09:59:58 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -39,6 +39,14 @@ t_env *envcpy(t_env *env)
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);
}
int cmd_env(char **argv, t_env **env)
{
int i;
@@ -54,11 +62,7 @@ int cmd_env(char **argv, t_env **env)
while (it)
{
if ((new = envcpy(it)) == NULL)
{
ft_envdel(&env_cp);
ft_putstr_fd("minishell: env: Env copy error\n", 2);
return (2);
}
return (env_cleanup(env_cp, 2));
ft_envaddend(&env_cp, new);
it = it->next;
}
@@ -69,6 +73,5 @@ int cmd_env(char **argv, t_env **env)
exec_cmd(argv + i, &env_cp);
else
put_env(env_cp);
ft_envdel(&env_cp);
return (0);
return (env_cleanup(env_cp, 0));
}

156
srcs/ms_env.c
View File

@@ -1,156 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ms_env.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/09/20 11:43:53 by tmaze #+# #+# */
/* Updated: 2019/11/10 20:49:35 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void ft_envdelelem(t_env **elem)
{
if (elem)
{
ft_strdel(&((*elem)->key));
ft_strdel(&((*elem)->val));
ft_memdel((void**)elem);
}
}
void ft_envdel(t_env **env)
{
t_env *tmp;
while (*env)
{
tmp = *env;
*env = (*env)->next;
ft_envdelelem(&tmp);
}
}
t_env *ft_envnew(char *env)
{
t_env *ret;
int i;
i = 0;
ret = NULL;
while (env[i] && env[i] != '=')
i++;
if (env[i] == '=' && (ret = (t_env*)ft_memalloc(sizeof(t_env))) != NULL)
if ((ret->val = ft_strsub(env, i + 1, ft_strlen(env) - i - 1)) == NULL
|| (ret->key = ft_strsub(env, 0, i)) == NULL)
ft_envdelelem(&ret);
return (ret);
}
t_env *ft_envaddend(t_env **alst, t_env *new)
{
t_env *tmp;
if (new == NULL)
return (NULL);
if (*alst == NULL)
*alst = new;
else
{
tmp = *alst;
while (tmp->next)
tmp = tmp->next;
tmp->next = new;
}
return (*alst);
}
t_env *ft_envgetelem(char *key, t_env *env)
{
t_env *it;
it = env;
while (it && !ft_strequ(it->key, key))
it = it->next;
return (it);
}
char *ft_envtochar(t_env *env)
{
int size;
char *ret;
size = ft_strlen(env->key) + ft_strlen(env->val) + 1;
if ((ret = ft_strnew(size)) != NULL)
{
ft_strlcpy(ret, env->key, size);
ft_strlcat(ret, "=", size);
ft_strlcat(ret, env->val, size);
}
return (ret);
}
char **ft_envtotab(t_env *env)
{
t_env *it;
char *new;
char **ret;
int i;
i = 0;
ret = NULL;
it = env;
while (it && (++i))
it = it->next;
if ((ret = (char**)ft_memalloc(sizeof(char*) * (i + 1))) == NULL)
return (NULL);
it = env;
i = 0;
while (it)
{
if ((new = ft_envtochar(it)) == NULL)
ft_del_words_tables(&ret);
if (new == NULL)
break ;
ret[i++] = new;
it = it->next;
}
return (ret);
}
char *ft_envupdate(char *key, t_env *env, char *val)
{
t_env *elem;
char *new;
new = NULL;
if ((elem = ft_envgetelem(key, env)) != NULL)
if ((new = ft_strdup(val)) != NULL)
{
ft_strdel(&elem->val);
elem->val = new;
}
return (new);
}
void ft_envclean(t_env **env)
{
t_env **it;
t_env *tmp;
it = env;
while (*it)
{
if (ft_strequ((*it)->val, ""))
{
tmp = *it;
*it = tmp->next;
ft_envdelelem(&tmp);
}
else
it = &((*it)->next);
}
}

12
srcs/ms_ext.c
View File

@@ -67,11 +67,11 @@ 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)
+ 1, *index)) != NULL)
{
ft_strdel(&src);
src = ret;
@@ -79,10 +79,10 @@ char *resolve_complete_key(char *src, int *index, t_env *env)
return (src);
}
else
return return_null("minishell: memory error");
return (return_null("minishell: memory error"));
}
else
return return_null("minishell: variable not found");
return (return_null("minishell: variable not found"));
}
char **res_ext(char **av, t_env *env)
@@ -97,8 +97,8 @@ char **res_ext(char **av, t_env *env)
i[2] = 0;
while (av[i[0]] && av[i[0]][i[2]])
{
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
{
ft_strdel(&av[i[0]]);
av[i[0]] = ret;