parsing ~

This commit is contained in:
2024-02-17 00:31:54 +01:00
parent 1053b6cd1c
commit da27fbe414
2 changed files with 22 additions and 3 deletions

View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/09 15:26:01 by tomoron #+# #+# */
/* Updated: 2024/02/16 16:34:13 by tomoron ### ########.fr */
/* Updated: 2024/02/17 00:29:12 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
@ -16,6 +16,21 @@ int is_cmd_char(char c)
return (!ft_isspace(c) && c != '|' && c != '&' && c != '<' && c != '>');
}
int add_home_to_str(char *res)
{
int i;
char *str;
i = 0;
str = getenv("HOME");
while(str[i])
{
res[i] = str[i];
i++;
}
return(i);
}
char *get_token(char **cmd, int *in_quote, int *in_dquote, t_env *env)
{
char *res;
@ -33,9 +48,11 @@ char *get_token(char **cmd, int *in_quote, int *in_dquote, t_env *env)
*in_quote = !*in_quote;
if (**cmd == '$' && !*in_quote)
{
(*cmd) += EXIT_FAILURE;
(*cmd)++;
i += add_var_to_str(res + i, cmd, env);
}
if(**cmd == '~' && !*in_quote && !*in_dquote)
i+= add_home_to_str(res + i);
else if (((**cmd == '\'' && *in_dquote) || (**cmd == '"' && *in_quote))
|| (**cmd != '\'' && **cmd != '"'))
res[i++] = **cmd;