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

exit sur la sortie d'erreure et parsing des variables $ mieux

Browse Source
This commit is contained in:
Tom Moron
2024-02-12 20:12:39 +01:00
parent f63d26dea7
commit 979e4e54a0
21 changed files with 33154 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ft_parsing_var.c Normal file → Executable file
View File

@ -6,7 +6,7 @@
/* By: tomoron <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/09 15:24:36 by tomoron #+# #+# */
/* Updated: 2024/02/09 18:22:16 by tomoron ### ########.fr */
/* Updated: 2024/02/12 20:11:18 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -29,7 +29,7 @@ int ft_get_var_len(char **command, t_env *env)
(*command)++;
if (!ft_isalnum(**command) && **command != '_' && **command != '?')
return (1);
return (2);
if (**command == '?')
return (get_number_len(g_return_code));
var_name = get_var_name(*command);
@ -68,31 +68,45 @@ int ft_get_token_len(char *command, t_env *env)
return (res);
}
int ft_add_return_code_to_str(char *res)
{
char *var;
int i;
i = 0;
var = ft_itoa(g_return_code);
while (var && var[i])
{
res[i] = var[i];
i++;
}
free(var);
return (i);
}
int ft_add_var_to_str(char *res, char **command, t_env *env)
{
char *var_name;
char *var;
int i;
i = -1;
i = 0;
if (!ft_isalnum(**command) && **command != '_' && **command != '?')
{
*res = '$';
return (1);
res[0] = '$';
res[1] = **command;
return (2);
}
if (**command == '?')
{
var = ft_itoa(g_return_code);
while (var && var[++i])
res[i] = var[i];
free(var);
return (i + 1);
}
return (ft_add_return_code_to_str(res));
var_name = get_var_name(*command);
var = ft_getenv(env, var_name);
free(var_name);
while (var && var[++i])
while (var && var[i])
{
res[i] = var[i];
i++;
}
*command += get_var_name_len(*command) - 1;
return (i + !var);
return (i);
}