42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-05-13 16:08:45 +02:00
Code Activity

「🔨」 fix: quote fixed

Browse Source
This commit is contained in:
Adam JOLY
2024-07-15 14:27:43 +02:00
parent 27ac717f67
commit 17bb4ce14e
4 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/parsing/env_var/env_var_replace.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */
/* Updated: 2024/07/15 14:00:50 by adjoly ### ########.fr */
/* Updated: 2024/07/15 14:26:26 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -62,14 +62,17 @@ size_t strlen_till_notalnum(char *s)
size_t __add_dollar(t_env *env, char **rl_dollared, char *tmp)
{
size_t dollar_size;
char *exit_code;
tmp++;
if ((*tmp) == '?')
{
ft_strlcat(*rl_dollared, ft_itoa(get_exit_code(-1)), \
ft_strlen(ft_itoa(get_exit_code(-1))) \
exit_code = ft_itoa(get_exit_code(-1));
ft_strlcat(*rl_dollared, exit_code, \
ft_strlen(exit_code) \
+ ft_strlen(*rl_dollared) + 1);
return (1);
free(exit_code);
return (2);
}
dollar_size = strlen_till_notalnum(tmp);
__cpy_dollar(tmp, dollar_size, env, rl_dollared);
@ -88,7 +91,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);

4
src/parsing/tokenizer/__to_redir.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/25 15:06:15 by adjoly #+# #+# */
/* Updated: 2024/07/14 17:25:25 by adjoly ### ########.fr */
/* Updated: 2024/07/15 14:12:50 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,8 +27,6 @@ t_redirection *__to_redir(char *redir_s)
while (*redir_s && *redir_s == ' ')
redir_s++;
tmp = redir_s;
// if (*tmp == '/' || *tmp == '.')
// return (redir);
if (!ft_isalnum(*tmp) && *tmp != '/' && *tmp != '.')
return (redir);
while (*tmp && ft_isalnum(*tmp) && *tmp != '/' && *tmp != '.')