diff --git a/Makefile b/Makefile index a83daed..e098e39 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: marde-vr +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/07/28 00:35:01 by tomoron #+# #+# # -# Updated: 2024/04/13 12:56:12 by tomoron ### ########.fr # +# Updated: 2024/04/14 11:30:37 by marde-vr ### ########.fr # # # # **************************************************************************** # @@ -56,7 +56,7 @@ all: $(NAME) : $(LIBFT) $(OBJS) @$(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME) @echo project ready - @timeout 2 bash -c 'while :; do r=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l);g=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l); b=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l);xrandr --output "HDMI-1-2" --gamma $$r:$$g:$$b;sleep 0.05;done' || true && xrandr --output HDMI-1-2 --brightness 1& + #@timeout 2 bash -c 'while :; do r=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l);g=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l); b=$$(echo "scale=2;($$RANDOM / 16384) + 0.01" | bc -l);xrandr --output "HDMI-1-2" --gamma $$r:$$g:$$b;sleep 0.05;done' || true && xrandr --output HDMI-1-2 --brightness 1& $(LIBFT): @echo compiling libft... diff --git a/srcs/exec_bonus.c b/srcs/exec_bonus.c index 1fc8e05..4353f0e 100755 --- a/srcs/exec_bonus.c +++ b/srcs/exec_bonus.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ -/* Updated: 2024/04/14 11:41:29 by marde-vr ### ########.fr */ +/* Updated: 2024/04/15 16:54:53 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -159,8 +159,7 @@ void exec_commands(t_msh *msh) i = 0; while (i < cmd_count) { - if (i != 0) - get_redirections(msh, msh->cmds); + get_redirections(msh, msh->cmds); ft_printf_fd(2, "command: %s, in_type: %d, out_type: %d\n", msh->cmds->value, msh->in_type, msh->out_type); exec_command(msh, i, cmd_count); free(msh->fds[i]); diff --git a/srcs/input_redirections.c b/srcs/input_redirections.c index 222c85e..3c446f8 100755 --- a/srcs/input_redirections.c +++ b/srcs/input_redirections.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 18:15:27 by marde-vr #+# #+# */ -/* Updated: 2024/04/14 10:41:33 by marde-vr ### ########.fr */ +/* Updated: 2024/04/15 17:13:30 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -59,8 +59,14 @@ void get_in_type(t_msh *msh, t_cmd *tokens) t_cmd *cur_token; cur_token = tokens; + //if (cur_token->cmd_type == PIPE) while (cur_token && (cur_token->cmd_type == CMD || cur_token->cmd_type == PAREN)) + { + ft_printf_fd(2, "%s: %d\n", cur_token->value, cur_token->cmd_type); cur_token = cur_token->next; + } + if (cur_token) + ft_printf_fd(2, "%s: %d\n", cur_token->value, cur_token->cmd_type); if (cur_token && (is_input_type(cur_token) || cur_token->cmd_type == PIPE)) { msh->in_type = cur_token->cmd_type; diff --git a/srcs/output_redirections.c b/srcs/output_redirections.c index 9b7c955..c028f84 100755 --- a/srcs/output_redirections.c +++ b/srcs/output_redirections.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 19:10:52 by marde-vr #+# #+# */ -/* Updated: 2024/04/15 12:36:18 by marde-vr ### ########.fr */ +/* Updated: 2024/04/15 17:02:17 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -70,7 +70,12 @@ void get_out_type(t_msh *msh, t_cmd *cmds) msh->out_fd = 0; cur_cmd = cmds; while (cur_cmd && cur_cmd->next && !is_output_type(cur_cmd) && !is_operand_type(cur_cmd) && cur_cmd->cmd_type != PIPE) + { + ft_printf_fd(2, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type); cur_cmd = cur_cmd->next; + } + if (cur_cmd) + ft_printf_fd(2, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type); if (cur_cmd->cmd_type == CMD || cur_cmd->cmd_type == PAREN) msh->out_type = 0; else if(cur_cmd && is_output_type(cur_cmd) && !is_operand_type(cur_cmd) && cur_cmd->cmd_type != PIPE) diff --git a/srcs/vim b/srcs/vim new file mode 100644 index 0000000..397db75 --- /dev/null +++ b/srcs/vim @@ -0,0 +1 @@ +: