From 071331644b61100f9f3abfa8d90fec5f88cfcb8d Mon Sep 17 00:00:00 2001 From: mdev9 Date: Mon, 4 Mar 2024 13:40:41 +0100 Subject: [PATCH] working on fixing args count --- srcs/exec.c | 18 +++++------------- srcs/main.c | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/srcs/exec.c b/srcs/exec.c index a82b20d..0e15fcb 100755 --- a/srcs/exec.c +++ b/srcs/exec.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */ -/* Updated: 2024/03/04 13:00:21 by marde-vr ### ########.fr */ +/* Updated: 2024/03/04 13:40:17 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -132,7 +132,7 @@ int get_args_count(t_cmd *cmds) if (cur_cmd->type == ARG) count++; else - cur_cmd = cur_cmd->next; + cur_cmd = cur_cmd->next->next; } if (cur_cmd->type == ARG) count++; @@ -294,14 +294,14 @@ char **get_cmd_args(t_msh *msh) if (!cmd_args || !msh->fds) ft_exit(msh, 1); cur_cmd = msh->cmds; - //ft_printf_fd(2, "cmd: %s: args_count: %d\n", cur_cmd->token, args_count); + ft_printf_fd(2, "cmd: %s: args_count: %d\n", cur_cmd->token, args_count); i = 0; while (i < args_count) { if (cur_cmd->type == ARG) { cmd_args[i] = cur_cmd->token; - //ft_printf_fd(2, "%s[%d] = %s\n", msh->cmds->token, i, cur_cmd->token); + ft_printf_fd(2, "%s[%d] = %s\n", msh->cmds->token, i, cur_cmd->token); i++; } else @@ -351,17 +351,9 @@ void get_in_type(t_msh *msh, t_cmd *cmds) { t_cmd *cur_cmd; - //msh->in_type = ARG; - cur_cmd = cmds; while (cur_cmd && cur_cmd->next && cur_cmd->type == ARG) cur_cmd = cur_cmd->next; - /* - if (!cur_cmd->type) - { - //msh->in_type = ARG; - } - else */ if (cur_cmd->type) { msh->in_type = cur_cmd->type; @@ -379,7 +371,7 @@ void get_in_type(t_msh *msh, t_cmd *cmds) { ft_printf_fd(2, "minishell: %s: ", cur_cmd->next->token); perror(""); - // todo: cancel execution of all commands + // todo: cancel execution of all commands????????????????? idk g_return_code = 1; } } diff --git a/srcs/main.c b/srcs/main.c index a61bc9e..97abaa5 100755 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ -/* Updated: 2024/03/04 10:24:54 by marde-vr ### ########.fr */ +/* Updated: 2024/03/04 13:39:15 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -100,7 +100,7 @@ int main(int argc, char **argv, char **envp) msh->cmds = parse_command(command, msh->env); free(command); msh->cmds = handle_alias(msh); - //print_parsed_cmd(msh->cmds); // debug + print_parsed_cmd(msh->cmds); // debug exec_command(msh); free_cmd(msh->cmds); }