mirror of
https://github.com/KeyZox71/ft_minipowershell.git
synced 2025-03-15 03:16:51 +01:00
「🔨」 fix: fixed some things.
This commit is contained in:
4
src/env/env_list/ft_envadd_back.c
vendored
4
src/env/env_list/ft_envadd_back.c
vendored
@ -6,7 +6,7 @@
|
|||||||
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
/* By: mmoussou <mmoussou@student.42angouleme.fr +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2023/11/08 17:42:57 by mmoussou #+# #+# */
|
/* Created: 2023/11/08 17:42:57 by mmoussou #+# #+# */
|
||||||
/* Updated: 2024/05/03 16:03:57 by mmoussou ### ########.fr */
|
/* Updated: 2024/08/13 15:07:07 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ void ft_envadd_back(t_env **env, t_env *new)
|
|||||||
{
|
{
|
||||||
t_env *tmp;
|
t_env *tmp;
|
||||||
|
|
||||||
if (!env || !new)
|
if (!env)
|
||||||
return ;
|
return ;
|
||||||
if (!*env)
|
if (!*env)
|
||||||
{
|
{
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/07/09 16:32:21 by adjoly #+# #+# */
|
/* Created: 2024/07/09 16:32:21 by adjoly #+# #+# */
|
||||||
/* Updated: 2024/08/10 17:44:56 by adjoly ### ########.fr */
|
/* Updated: 2024/08/13 15:11:58 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/08/05 14:19:35 by adjoly #+# #+# */
|
/* Created: 2024/08/05 14:19:35 by adjoly #+# #+# */
|
||||||
/* Updated: 2024/08/13 13:40:20 by adjoly ### ########.fr */
|
/* Updated: 2024/08/13 15:06:13 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/05/18 20:13:50 by adjoly #+# #+# */
|
/* Created: 2024/05/18 20:13:50 by adjoly #+# #+# */
|
||||||
/* Updated: 2024/08/13 13:47:48 by adjoly ### ########.fr */
|
/* Updated: 2024/08/13 15:18:14 by adjoly ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -28,6 +28,7 @@ t_list *tokenizer(char *readline, t_env *env)
|
|||||||
t_list *cmd;
|
t_list *cmd;
|
||||||
t_list *piped;
|
t_list *piped;
|
||||||
t_list *tmp;
|
t_list *tmp;
|
||||||
|
t_cmd *ret;
|
||||||
|
|
||||||
(void)(env);
|
(void)(env);
|
||||||
piped = __split_pipe(readline);
|
piped = __split_pipe(readline);
|
||||||
@ -37,17 +38,18 @@ t_list *tokenizer(char *readline, t_env *env)
|
|||||||
get_list(&piped);
|
get_list(&piped);
|
||||||
while (tmp)
|
while (tmp)
|
||||||
{
|
{
|
||||||
ft_lstadd_back(&cmd,
|
ret = __to_cmd(split_argv(env_var_replace(tmp->content, env)));
|
||||||
ft_lstnew(__to_cmd(split_argv(env_var_replace(tmp->content,
|
if (!ret)
|
||||||
env)))));
|
return (clear_all(cmd, piped));
|
||||||
|
ft_lstadd_back(&cmd, ft_lstnew(ret));
|
||||||
if (!cmd)
|
if (!cmd)
|
||||||
return (clear_all(cmd, piped));
|
return (clear_all(cmd, piped));
|
||||||
if (!ft_lstlast(cmd)->content)
|
|
||||||
return (clear_all(cmd, piped));
|
|
||||||
if (!cmd->next)
|
|
||||||
get_list2(&cmd);
|
|
||||||
if (((t_cmd *)ft_lstlast(cmd)->content)->infile == -2)
|
if (((t_cmd *)ft_lstlast(cmd)->content)->infile == -2)
|
||||||
return (clear_all(cmd, piped));
|
return (clear_all(cmd, piped));
|
||||||
|
//if (!ft_lstlast(cmd)->content)
|
||||||
|
//return (clear_all(cmd, piped));
|
||||||
|
if (!cmd->next)
|
||||||
|
get_list2(&cmd);
|
||||||
tmp = tmp->next;
|
tmp = tmp->next;
|
||||||
}
|
}
|
||||||
ft_lstclear(&piped, free);
|
ft_lstclear(&piped, free);
|
||||||
|
Reference in New Issue
Block a user