42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-15 11:26:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「✨」 feat(builtins/export): fixed exports :D

Browse Source
This commit is contained in:
yosyo
2024-07-06 18:34:00 +02:00
parent 249b6a6920
commit 90af93aa73
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/env.h
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */ /* Created: 2024/04/29 13:20:22 by mmoussou #+# #+# */
/* Updated: 2024/06/22 14:07:50 by adjoly ### ########.fr */ /* Updated: 2024/07/06 18:24:48 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,7 +28,7 @@ typedef struct s_env
* *
* @return (int) 0 if everything goes well, 1 on error * @return (int) 0 if everything goes well, 1 on error
*/ */
int env_init(char **env_d, t_env *env); int env_init(char **env_d, t_env *env);
/** /**
* @brief get value of an env * @brief get value of an env
@ -38,7 +38,7 @@ int env_init(char **env_d, t_env *env);
* *
* @return (char *) content of the variable, NULL if doesn't exist * @return (char *) content of the variable, NULL if doesn't exist
*/ */
char *env_get_value(char *name, t_env *env); char *env_get_value(char *name, t_env *env);
/** /**
* @brief get value of an env * @brief get value of an env
@ -49,7 +49,7 @@ char *env_get_value(char *name, t_env *env);
* *
* @return (char *) content of the variable, NULL if doesn't exist * @return (char *) content of the variable, NULL if doesn't exist
*/ */
char *env_getn_value(char *name, t_env *env, int n); char *env_getn_value(char *name, t_env *env, int n);
/** /**
* @brief get an array from the env struct * @brief get an array from the env struct
@ -58,7 +58,7 @@ char *env_getn_value(char *name, t_env *env, int n);
* *
* @return (char **) the array, or NULL on error * @return (char **) the array, or NULL on error
*/ */
char **env_get(t_env *env); char **env_get(t_env *env);
/** /**
* @brief append content at the end of an env variable * @brief append content at the end of an env variable
@ -69,7 +69,7 @@ char **env_get(t_env *env);
* *
* @return (int) 0 if everything goes well, -1 on error * @return (int) 0 if everything goes well, -1 on error
*/ */
int env_append(char *name, char *content, t_env *env); int env_append(char *name, char *content, t_env *env);
/** /**
* @brief replace the content of an env variable * @brief replace the content of an env variable
@ -80,7 +80,7 @@ int env_append(char *name, char *content, t_env *env);
* *
* @return (int) 0 if everything goes well, -1 on error * @return (int) 0 if everything goes well, -1 on error
*/ */
int env_edit(char *name, char *content, t_env *env); int env_edit(char *name, char *content, t_env *env);
/** /**
* @brief delete an entry in the env struct * @brief delete an entry in the env struct
@ -90,15 +90,17 @@ int env_edit(char *name, char *content, t_env *env);
* *
* @return (int) 0 if everything goes well, -1 on error * @return (int) 0 if everything goes well, -1 on error
*/ */
int env_delete(char *name, t_env *env); int env_delete(char *name, t_env *env);
t_env *env_create_el(char *env_line);
// theses are literally the linked-list functions but for env // theses are literally the linked-list functions but for env
void ft_envadd_back(t_env **env, t_env *new); void ft_envadd_back(t_env **env, t_env *new);
void ft_envadd_front(t_env **lst, t_env *new); void ft_envadd_front(t_env **lst, t_env *new);
void ft_envclear(t_env **lst, void (*del)(void *)); void ft_envclear(t_env **lst, void (*del)(void *));
void ft_envdelone(t_env *lst, void (*del)(void *)); void ft_envdelone(t_env *lst, void (*del)(void *));
t_env *ft_envlast(t_env *env); t_env *ft_envlast(t_env *env);
t_env *ft_envnew(char *name, char *content); t_env *ft_envnew(char *name, char *content);
unsigned int ft_envsize(t_env *lst); unsigned int ft_envsize(t_env *lst);
/** /**
@ -108,6 +110,6 @@ unsigned int ft_envsize(t_env *lst);
* *
* @return (void) * @return (void)
*/ */
void ft_envprint(t_env *env); void ft_envprint(t_env *env);
#endif #endif

10
src/builtins/ft_export.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/26 08:42:36 by mmoussou #+# #+# */ /* Created: 2024/06/26 08:42:36 by mmoussou #+# #+# */
/* Updated: 2024/06/27 15:52:42 by mmoussou ### ########.fr */ /* Updated: 2024/07/06 18:27:41 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -76,6 +76,8 @@ void ft_export(char **args, t_env *env)
} }
while (*args) while (*args)
{ {
if (!strchr(*args, '='))
return ;
name = ft_calloc(sizeof(char), ft_strchr(*args, '=') - *args + 1); name = ft_calloc(sizeof(char), ft_strchr(*args, '=') - *args + 1);
content = ft_calloc(sizeof(char), ft_strlen(ft_strchr(*args, '='))); content = ft_calloc(sizeof(char), ft_strlen(ft_strchr(*args, '=')));
if (!name || !content) if (!name || !content)
@ -83,13 +85,13 @@ void ft_export(char **args, t_env *env)
ft_free("cc", &name, &content); ft_free("cc", &name, &content);
return ; return ;
} }
ft_strlcpy(name, *args, ft_strchr(*args, '=') - *args); ft_strlcpy(name, *args, ft_strchr(*args, '=') - *args + 1);
ft_strlcpy(content, ft_strchr(*args, '=') + 1, ft_strlcpy(content, ft_strchr(*args, '=') + 1,
ft_strlen(ft_strchr(*args, '='))); ft_strlen(ft_strchr(*args, '=')) + 1);
if (env_get_value(name, env)) if (env_get_value(name, env))
env_edit(name, content, env); env_edit(name, content, env);
else else
env_append(name, content, env); ft_envadd_back(&env, ft_envnew(name, content));
args++; args++;
} }
} }

2
src/exec/exec_split_cmd.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */ /* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */ /* Created: 2024/06/01 14:55:06 by mmoussou #+# #+# */
/* Updated: 2024/07/06 14:23:32 by mmoussou ### ########.fr */ /* Updated: 2024/07/06 18:12:25 by mmoussou ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */