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

parsing ~

Browse Source
This commit is contained in:
tomoron
2024-02-17 00:31:54 +01:00
parent 1053b6cd1c
commit da27fbe414
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
srcs/parsing.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:26:01 by tomoron #+# #+# */ /* 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" #include "minishell.h"
@ -16,6 +16,21 @@ int is_cmd_char(char c)
return (!ft_isspace(c) && c != '|' && c != '&' && c != '<' && 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 *get_token(char **cmd, int *in_quote, int *in_dquote, t_env *env)
{ {
char *res; char *res;
@ -33,9 +48,11 @@ char *get_token(char **cmd, int *in_quote, int *in_dquote, t_env *env)
*in_quote = !*in_quote; *in_quote = !*in_quote;
if (**cmd == '$' && !*in_quote) if (**cmd == '$' && !*in_quote)
{ {
(*cmd) += EXIT_FAILURE; (*cmd)++;
i += add_var_to_str(res + i, cmd, env); 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)) else if (((**cmd == '\'' && *in_dquote) || (**cmd == '"' && *in_quote))
|| (**cmd != '\'' && **cmd != '"')) || (**cmd != '\'' && **cmd != '"'))
res[i++] = **cmd; res[i++] = **cmd;

4
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/02/13 16:25:37 by marde-vr ### ########.fr */ /* Updated: 2024/02/17 00:23:02 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -58,6 +58,8 @@ int get_token_len(char *command, t_env *env)
in_quote = !in_quote; in_quote = !in_quote;
if (*command == '$' && !in_quote) if (*command == '$' && !in_quote)
res += get_var_len(&command, env); res += get_var_len(&command, env);
if (*command == '~' && !in_quote && !in_dquote)
res += ft_strlen(getenv("HOME"));
else if (*command != '\'' && *command != '"') else if (*command != '\'' && *command != '"')
res++; res++;
else if ((*command == '\'' && in_dquote) else if ((*command == '\'' && in_dquote)