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

fix $""coucou

Browse Source
This commit is contained in:
tomoron
2024-05-03 12:56:07 +02:00
parent 6e93081fcb
commit 2d5449ed3d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
srcs/parsing_var.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/09 15:24:36 by tomoron #+# #+# */ /* Created: 2024/02/09 15:24:36 by tomoron #+# #+# */
/* Updated: 2024/04/26 18:58:42 by tomoron ### ########.fr */ /* Updated: 2024/05/03 12:52:45 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -28,7 +28,9 @@ int get_var_len(char **command, t_env *env)
char *env_var; char *env_var;
(*command)++; (*command)++;
if (**command == '\'' || **command == '"' || !**command) if (**command == '\'' || **command == '"')
return(0);
if (!**command)
return (1); return (1);
if (!ft_isalnum(**command) && **command != '_' && **command != '?') if (!ft_isalnum(**command) && **command != '_' && **command != '?')
return (2); return (2);
@ -90,9 +92,10 @@ int add_var_to_str(char *res, char **command, t_env *env, int *is_var)
*is_var = 1; *is_var = 1;
if (**command == '\'' || **command == '"' || !**command) if (**command == '\'' || **command == '"' || !**command)
{ {
if (**command != '\'' && **command != '"')
*res = '$'; *res = '$';
(*command)--; (*command)--;
return (1); return (*(*command + 1) != '\'' && *(*command + 1) != '"');
} }
if (!ft_isalnum(**command) && **command != '_' && **command != '?') if (!ft_isalnum(**command) && **command != '_' && **command != '?')
return (invalid_variable_char(res, **command)); return (invalid_variable_char(res, **command));