mirror of
https://github.com/KeyZox71/ft_minipowershell.git
synced 2025-03-15 03:16:51 +01:00
「🔨」 fix: some fix to the parsing
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/07/03 16:34:19 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/14 15:34:16 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/14 17:30:41 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/14 14:50:44 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/14 19:21:23 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -38,7 +38,7 @@ void __cpy_dollar(char *tmp, size_t dollar_size, t_env *env, char **rl_dlrd)
|
||||
{
|
||||
char *dollar;
|
||||
|
||||
dollar = __rep_quote(env_getn_value(tmp, env, dollar_size - 2));
|
||||
dollar = __rep_quote(env_getn_value(tmp, env, dollar_size - 1));
|
||||
if (!dollar)
|
||||
{
|
||||
tmp += dollar_size;
|
||||
@ -73,7 +73,7 @@ size_t __add_dollar(t_env *env, char **rl_dollared, char *tmp)
|
||||
}
|
||||
dollar_size = strlen_till_notalnum(tmp);
|
||||
__cpy_dollar(tmp, dollar_size, env, rl_dollared);
|
||||
return (dollar_size);
|
||||
return (dollar_size + 1);
|
||||
}
|
||||
|
||||
char *env_var_replace(char *readline, t_env *env)
|
||||
@ -88,7 +88,7 @@ char *env_var_replace(char *readline, t_env *env)
|
||||
while (*tmp)
|
||||
{
|
||||
if (*tmp == '$' && is_inquote(readline, tmp - readline) != SINGLE)
|
||||
tmp += __add_dollar(env, &rl_dollared, tmp) + 1;
|
||||
tmp += __add_dollar(env, &rl_dollared, tmp);
|
||||
else
|
||||
{
|
||||
ft_strlcat(rl_dollared, tmp, ft_strlen(rl_dollared) + 2);
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/06 15:01:19 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/13 17:03:06 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/14 19:23:08 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -33,7 +33,7 @@ size_t __add_sizeof_dollar(size_t size, char **tmp, t_env *env, char *readline)
|
||||
{
|
||||
(*tmp)++;
|
||||
size -= strlen_till_notalnum(*tmp);
|
||||
dollar = env_getn_value(*tmp, env, strlen_till_notalnum(*tmp));
|
||||
dollar = env_getn_value(*tmp, env, strlen_till_notalnum(*tmp) - 1);
|
||||
if (!dollar)
|
||||
return (size);
|
||||
size += ft_strlen(dollar);
|
||||
@ -52,6 +52,8 @@ size_t get_size_with_env(char *readline, t_env *env)
|
||||
while (*tmp)
|
||||
{
|
||||
size = __add_sizeof_dollar(size, &tmp, env, readline);
|
||||
if (!*tmp)
|
||||
break ;
|
||||
tmp++;
|
||||
}
|
||||
return (size + 1);
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/30 15:56:53 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/14 15:19:48 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/14 17:32:34 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/05/25 15:06:15 by adjoly #+# #+# */
|
||||
/* Updated: 2024/07/14 15:52:04 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/07/14 17:25:25 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -27,11 +27,11 @@ t_redirection *__to_redir(char *redir_s)
|
||||
while (*redir_s && *redir_s == ' ')
|
||||
redir_s++;
|
||||
tmp = redir_s;
|
||||
if (*tmp == '/' || *tmp == '.')
|
||||
// if (*tmp == '/' || *tmp == '.')
|
||||
// return (redir);
|
||||
if (!ft_isalnum(*tmp) && *tmp != '/' && *tmp != '.')
|
||||
return (redir);
|
||||
if (!ft_isalnum(*tmp))
|
||||
return (redir);
|
||||
while (*tmp && ft_isalnum(*tmp))
|
||||
while (*tmp && ft_isalnum(*tmp) && *tmp != '/' && *tmp != '.')
|
||||
tmp++;
|
||||
redir->file_name = ft_calloc(tmp - redir_s + 1, sizeof(char));
|
||||
ft_strlcpy(redir->file_name, redir_s, tmp - redir_s + 1);
|
||||
|
Reference in New Issue
Block a user