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

here doc variable d'environnement

Browse Source
This commit is contained in:
tomoron
2024-03-25 18:16:48 +01:00
parent a7ce98266c
commit 6ffeebf87b
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
srcs/here_doc.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */ /* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
/* Updated: 2024/03/25 13:18:05 by marde-vr ### ########.fr */ /* Updated: 2024/03/25 18:12:26 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -53,6 +53,32 @@ int contains_newline(char *str)
return (0); return (0);
} }
void parse_var(t_msh *msh, char *line)
{
char *var_name;
while(*line)
{
if(*line == '$')
{
var_name = get_var_name(line + 1);
if(!var_name)
return;
line += ft_strlen(var_name);
if(!*var_name)
write(msh->in_fd, "$", 1);
else if(!ft_strcmp(var_name, "?"))
ft_putnbr_fd(g_return_code, msh->in_fd);
else
ft_putstr_fd(ft_get_env(msh->env, var_name), msh->in_fd);
free(var_name);
}
else
write(msh->in_fd, line, 1);
line++;
}
}
void get_here_doc_input(t_msh *msh, char *eof) void get_here_doc_input(t_msh *msh, char *eof)
{ {
char *line; char *line;
@ -70,7 +96,7 @@ void get_here_doc_input(t_msh *msh, char *eof)
} }
if (line && !ft_strncmp(line, eof, ft_strlen(eof))) if (line && !ft_strncmp(line, eof, ft_strlen(eof)))
break ; break ;
write(msh->in_fd, line, ft_strlen(line)); parse_var(msh, line);
write(msh->in_fd, "\n", 1); write(msh->in_fd, "\n", 1);
} }
free(line); free(line);

3
srcs/minishell.h
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */ /* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
/* Updated: 2024/03/25 12:36:03 by tomoron ### ########.fr */ /* Updated: 2024/03/25 18:15:41 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -109,5 +109,6 @@ int file_access(t_msh *msh, int *found);
char *remove_path(char *token); char *remove_path(char *token);
void signal_handler_interactive(int signum); void signal_handler_interactive(int signum);
void signal_handler_command(int signum); void signal_handler_command(int signum);
char *get_var_name(char *str);
#endif #endif