merge hugogogo with master resolve conflict
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
|
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
|
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
|
||||||
/* Updated: 2021/11/02 14:01:34 by hulamy ### ########.fr */
|
/* Updated: 2021/11/02 14:15:04 by hulamy ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -64,9 +64,7 @@ void shell_loop(t_all *c)
|
|||||||
tcsetattr(STDIN_FILENO, TCSANOW, &c->interactive_termios);
|
tcsetattr(STDIN_FILENO, TCSANOW, &c->interactive_termios);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EXEC
|
||||||
|
|
||||||
// EXEC_PIPES_AND_CO
|
|
||||||
c->cmd_arr = parsing(c->token_list, c->envp);
|
c->cmd_arr = parsing(c->token_list, c->envp);
|
||||||
execute_cmd(c->envp, c->cmd_arr);
|
execute_cmd(c->envp, c->cmd_arr);
|
||||||
ft_lstclear((t_list **)&c->token_list, free);
|
ft_lstclear((t_list **)&c->token_list, free);
|
||||||
@@ -76,31 +74,6 @@ void shell_loop(t_all *c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wip_test()
|
|
||||||
{
|
|
||||||
char term_desc[2048];
|
|
||||||
char *term_type;
|
|
||||||
int term_width;
|
|
||||||
int term_height;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
term_type = getenv("TERM");
|
|
||||||
if (term_type == 0)
|
|
||||||
ft_putstr_fd("Specify a terminal type with `setenv TERM <yourtype>'.\n", 2);
|
|
||||||
ret = tgetent(term_desc, term_type);
|
|
||||||
if (ret < 0)
|
|
||||||
ft_putstr_fd("Could not access the termcap data base.\n", 2);
|
|
||||||
if (ret == 0)
|
|
||||||
ft_putstr_fd("Terminal type `%s' is not defined.\n", 2);
|
|
||||||
term_height = tgetnum ("li");
|
|
||||||
term_width = tgetnum ("co");
|
|
||||||
/* Extract information that termcap functions use. */
|
|
||||||
/* temp = tgetstr ("pc", BUFFADDR);
|
|
||||||
PC = temp ? *temp : 0;
|
|
||||||
BC = tgetstr ("le", BUFFADDR);
|
|
||||||
UP = tgetstr ("up", BUFFADDR); */
|
|
||||||
}
|
|
||||||
|
|
||||||
void close_fd(t_cmd *cmd)
|
void close_fd(t_cmd *cmd)
|
||||||
{
|
{
|
||||||
if (cmd->fd_in != 0)
|
if (cmd->fd_in != 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user