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

norm

Browse Source
This commit is contained in:
whaffman 2025-03-07 17:46:18 +01:00
parent d4baa4b440
commit c9c579c9bb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/expander/expander_parse_variables.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/19 13:58:13 by qmennen #+# #+# */ /* Created: 2025/02/19 13:58:13 by qmennen #+# #+# */
/* Updated: 2025/02/26 17:41:14 by whaffman ######## odam.nl */ /* Updated: 2025/03/07 16:39:06 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -53,9 +53,9 @@ t_list *expander_parse_variables(const char *s, t_minishell *msh)
t_list *var_list; t_list *var_list;
t_environment *env; t_environment *env;
i = 0; i = -1;
var_list = NULL; var_list = NULL;
while (s[i]) while (s[++i])
{ {
if (s[i] == '$') if (s[i] == '$')
{ {
@ -72,7 +72,6 @@ t_list *expander_parse_variables(const char *s, t_minishell *msh)
} }
else if (s[i] == '~') else if (s[i] == '~')
ft_lstadd_back(&var_list, create_tilde_env(msh)); ft_lstadd_back(&var_list, create_tilde_env(msh));
i++;
} }
return (var_list); return (var_list);
} }

7
src/parser/parser_get_arguments.c
View File

@ -6,14 +6,16 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/11 16:20:09 by qmennen #+# #+# */ /* Created: 2025/02/11 16:20:09 by qmennen #+# #+# */
/* Updated: 2025/02/28 14:07:23 by whaffman ######## odam.nl */ /* Updated: 2025/03/07 16:45:54 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
#include "typedef.h" #include "typedef.h"
static int parser_should_concact(t_minishell *msh, int argi, t_list *cur, t_list *prev) // Determine exact separation position r:30
static int parser_should_concact(t_minishell *msh, int argi,
t_list *cur, t_list *prev)
{ {
t_token *c_tkn; t_token *c_tkn;
t_token *p_tkn; t_token *p_tkn;
@ -27,7 +29,6 @@ static int parser_should_concact(t_minishell *msh, int argi, t_list *cur, t_list
if (!p_tkn || !c_tkn || c_tkn->position <= 0) if (!p_tkn || !c_tkn || c_tkn->position <= 0)
return (0); return (0);
lexer_char = msh->lexer->input[c_tkn->position - 1]; lexer_char = msh->lexer->input[c_tkn->position - 1];
// Determine exact separation position
return (c_tkn->type < 3 && p_tkn->type < 3 && !ft_isspace(lexer_char)); return (c_tkn->type < 3 && p_tkn->type < 3 && !ft_isspace(lexer_char));
} }