willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export always 0

Browse Source
This commit is contained in:
whaffman 2025-03-06 17:55:53 +01:00
parent 2c5499a72f
commit 6c5c8460b7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/builtin/builtin_export.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */ /* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */
/* Updated: 2025/03/06 17:41:54 by whaffman ######## odam.nl */ /* Updated: 2025/03/06 17:52:48 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,8 @@
static int ft_isvalid_identifier(char *str) static int ft_isvalid_identifier(char *str)
{ {
if (str == NULL || *str == '\0')
return (FALSE);
if (ft_isalpha(*str) == FALSE && *str != '_') if (ft_isalpha(*str) == FALSE && *str != '_')
return (FALSE); return (FALSE);
while (*str != '\0') while (*str != '\0')
@ -24,11 +26,13 @@ static int ft_isvalid_identifier(char *str)
} }
return (TRUE); return (TRUE);
} }
static int actually_append(t_minishell *msh, char *name, char *value) static int actually_append(t_minishell *msh, char *arg,
char *name, char *value)
{ {
char *value_old; char *value_old;
char *err;
if (name != NULL && value != NULL) if (ft_isvalid_identifier(name) && value != NULL)
{ {
if (environment_get(msh, name) == NULL) if (environment_get(msh, name) == NULL)
environment_update(msh, name, value); environment_update(msh, name, value);
@ -40,6 +44,8 @@ static int actually_append(t_minishell *msh, char *name, char *value)
} }
return (SUCCESS); return (SUCCESS);
} }
err = ft_strjoin_safe(msh, arg, ": not a valid identifier");
error_msg("export", err);
return (FAILURE); return (FAILURE);
} }
@ -57,7 +63,7 @@ static int handle_append(t_minishell *msh, char *arg)
name = ft_substr_safe(msh, arg, 0, name_end - arg); name = ft_substr_safe(msh, arg, 0, name_end - arg);
value = ft_strdup_safe(msh, ft_strchr(arg, '=') + 1); value = ft_strdup_safe(msh, ft_strchr(arg, '=') + 1);
if (name != NULL && value != NULL) if (name != NULL && value != NULL)
ret = actually_append(msh, name, value); ret = actually_append(msh, arg, name, value);
free_safe(msh, (void **)&name); free_safe(msh, (void **)&name);
free_safe(msh, (void **)&value); free_safe(msh, (void **)&value);
return (ret); return (ret);
@ -96,7 +102,7 @@ int builtin_export(t_minishell *msh, t_command *cmd)
while (cmd->args[++i] != NULL) while (cmd->args[++i] != NULL)
{ {
if (!handle_argument(msh, cmd->args[i])) if (!handle_argument(msh, cmd->args[i]))
return (EXIT_FAILURE); return (EXIT_SUCCESS);
} }
return (EXIT_SUCCESS); return (EXIT_SUCCESS);
} }