42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-05-11 15:08:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🔨」 fix: Fixed merge conflict on main

Browse Source
This commit is contained in:
Adam JOLY
2024-06-29 15:35:28 +02:00
parent 5e68b7342d
commit 26b8603933
7 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/06/20 12:30:56 by adjoly ### ########.fr */
/* Updated: 2024/06/29 15:32:44 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,6 +26,7 @@ t_cmd *get_redir_fd(void *content, t_env *env)
t_redirection_sign in;
t_cmd *cmd;
(void)env;
token = (t_token *)content;
tmp = token->redirection;
cmd = NULL;
@ -69,7 +70,7 @@ t_cmd *get_redir_fd(void *content, t_env *env)
cmd->infile = STDIN_FILENO;
if (out == INFILE)
cmd->outfile = STDOUT_FILENO;
char *ll = env_var_replace(token->argv, env);
cmd = split_cmd(ll, cmd);
// char *ll = env_var_replace(token->argv, env);
cmd = split_cmd(token->argv, cmd);
return (cmd);
}