42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-17 20:16:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix(builtins/ft_export): bad identifier checking

Browse Source
This commit is contained in:
yosyo
2024-07-15 13:34:31 +02:00
parent ab31b83147
commit 92d53ccfbb
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/builtins.h
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/22 13:05:18 by adjoly #+# #+# */
/* Updated: 2024/07/14 14:18:50 by adjoly ### ########.fr */
/* Updated: 2024/07/15 13:29:21 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -33,6 +33,7 @@ void ft_exit(char **argv, int ac);
char **env_get_list(t_env *env);
void add_to_env(char *name, char *content, t_env *env);
int check_export_input(char *input);
void ft_export(char **args, t_env *env);
#endif

11
src/builtins/ft_export.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/26 08:42:36 by mmoussou #+# #+# */
/* Updated: 2024/07/14 13:52:32 by mmoussou ### ########.fr */
/* Updated: 2024/07/15 13:31:22 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -103,9 +103,12 @@ void ft_export(char **args, t_env *env)
}
while (*args)
{
status = export_value(*args, env);
if (status)
return ;
if (!check_export_input(*args))
{
status = export_value(*args, env);
if (status)
return ;
}
args++;
}
}

25
src/builtins/ft_export_utils.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 18:59:27 by mmoussou #+# #+# */
/* Updated: 2024/07/14 14:26:18 by mmoussou ### ########.fr */
/* Updated: 2024/07/15 13:33:35 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -66,3 +66,26 @@ void add_to_env(char *name, char *content, t_env *env)
else
ft_envadd_back(&env, ft_envnew(name, content));
}
int check_export_input(char *input)
{
int i;
i = 0;
if ((!ft_isalpha(input[i]) && input[i] != '_') || input[i] == '=')
{
printf("minishell: export: '%s': not a valid identifier\n", input);
return (1);
}
i++;
while (input[i] && input[i] != '=')
{
if (!ft_isalnum(input[i]) && input[i] != '_')
{
printf("minishell: export: '%s': not a valid identifier\n", input);
return (1);
}
i++;
}
return (0);
}

4
src/main.c
View File

@ -6,7 +6,7 @@
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/24 11:18:04 by adjoly #+# #+# */
/* Updated: 2024/07/14 17:27:40 by adjoly ### ########.fr */
/* Updated: 2024/07/15 13:17:31 by mmoussou ### ########.fr */
/* */
/* ************************************************************************** */
@ -84,7 +84,7 @@ int main(int ac, char **av, char **env)
ft_lstclear(&piped, &free_token);
if (!cmd_list)
continue ;
if (format_quotes(cmd_list, env_l))
if (format_quotes(cmd_list))
{
ft_lstclear(get_list(NULL), &free_cmd);
continue ;