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

「✨」 feat: Added ctrl c to heredoc

Browse Source
This commit is contained in:
Adam JOLY
2024-07-13 14:16:31 +02:00
parent 310f26ef80
commit d7c5e9611b
18 changed files with 183 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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/09 20:23:16 by adjoly ### ########.fr */
/* Updated: 2024/07/13 14:14:20 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -54,6 +54,11 @@ char *env_var_replace(char *readline, t_env *env)
if (*tmp == '$' && is_inquote(readline, tmp - readline) != SINGLE)
{
tmp++;
if ((*tmp) == '?')
{
tmp++;
continue ;
}
dollar_size = strlen_till_notalnum(tmp);
__cpy_dollar(tmp, dollar_size, env, &rl_dollared);
tmp += dollar_size;

30
src/parsing/get_cmd_list.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/31 12:47:13 by adjoly #+# #+# */
/* Updated: 2024/07/10 01:12:52 by adjoly ### ########.fr */
/* Updated: 2024/07/13 14:08:31 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,20 +14,40 @@
#include "parsing.h"
#include "minishell.h"
t_list *make_lst(t_list *tmp)
{
t_list *cmd_list;
cmd_list = malloc(sizeof(t_list));
get_list2(&cmd_list);
cmd_list->next = NULL;
cmd_list->content = get_redir_fd(tmp->content);
return (cmd_list);
}
t_list *get_cmd_list(t_list *list)
{
t_list *tmp;
t_list *cmd_list;
tmp = list;
cmd_list = malloc(sizeof(t_list));
get_list2(&cmd_list);
cmd_list->next = NULL;
cmd_list->content = get_redir_fd(tmp->content);
cmd_list = make_lst(tmp);
if (!cmd_list->content)
{
free(cmd_list);
return (NULL);
}
tmp = tmp->next;
while (tmp)
{
ft_lstadd_back(&cmd_list, ft_lstnew(get_redir_fd(tmp->content)));
if (!ft_lstlast(cmd_list)->content)
{
ft_lstclear(&cmd_list, &free_cmd);
if (cmd_list)
free(cmd_list);
return (NULL);
}
tmp = tmp->next;
}
return (cmd_list);

7
src/parsing/get_redir_fd.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/30 10:48:41 by adjoly #+# #+# */
/* Updated: 2024/07/10 01:07:50 by adjoly ### ########.fr */
/* Updated: 2024/07/13 14:05:27 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -32,6 +32,11 @@ t_cmd *get_redir_fd(void *content)
while (tmp)
{
open_redir((t_redirection *)tmp->content, cmd, sign);
if (cmd->infile == -2)
{
free(cmd);
return (NULL);
}
tmp = tmp->next;
}
if (sign[0] == INFILE)

8
src/parsing/open_redir.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/30 15:56:53 by adjoly #+# #+# */
/* Updated: 2024/07/10 01:07:09 by adjoly ### ########.fr */
/* Updated: 2024/07/13 13:47:38 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -29,10 +29,14 @@ void open_redir(t_redirection *redir, t_cmd *cmd, t_redir_sign sign[2])
{
if (redir->sign == OUTFILE || redir->sign == OUT_APPEND)
sign[0] = __close_unused_fd(cmd, redir->sign);
if (redir->sign == INFILE || redir->sign == HEREDOC)
else if (redir->sign == INFILE || redir->sign == HEREDOC)
sign[1] = __close_unused_fd(cmd, redir->sign);
if (redir->sign == HEREDOC)
{
cmd->infile = ft_heredoc(redir->file_name, cmd);
if (cmd->infile == -2)
return ;
}
else if (redir->sign == INFILE)
cmd->infile = open(redir->file_name, O_RDONLY);
else if (redir->sign == OUTFILE)

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

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/20 21:05:04 by adjoly #+# #+# */
/* Updated: 2024/07/09 23:43:39 by adjoly ### ########.fr */
/* Updated: 2024/07/11 13:49:40 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -53,7 +53,9 @@ t_token *__to_token(char *cmd)
tmp += __get_sizeof_redir(tmp, tmp_redir);
}
else
{
token->argv = ft_strjoin_free(token->argv, ft_substr(tmp, 0, 1));
}
tmp++;
}
return (token);