jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/jzck/42sh

Browse source 
"needed"
This commit is contained in:
Antoine Riard 2017-03-27 03:49:18 +02:00
commit bdff3a032a
9 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
42sh/Makefile
View file

@ -196,6 +196,7 @@ job_control/job_run.c\
job_control/job_update_id.c\ job_control/job_update_id.c\
job_control/job_update_status.c\ job_control/job_update_status.c\
job_control/job_wait.c\ job_control/job_wait.c\
job_control/jobc_destroy.c\
job_control/mark_job_as_running.c\ job_control/mark_job_as_running.c\
job_control/pprint_brace.c\ job_control/pprint_brace.c\
job_control/pprint_case.c\ job_control/pprint_case.c\

4
42sh/includes/job_control.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */ /* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */
/* Updated: 2017/03/24 16:17:40 by gwojda ### ########.fr */ /* Updated: 2017/03/27 03:11:08 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -35,6 +35,8 @@ struct s_jobc
struct termios shell_tmodes; struct termios shell_tmodes;
}; };
int jobc_destroy(t_jobc *jobc);
t_list *job_getprocess(pid_t pid); t_list *job_getprocess(pid_t pid);
int job_addprocess(t_process *p); int job_addprocess(t_process *p);
void job_update_id(void); void job_update_id(void);

14
42sh/src/exec/exec_destroy.c
View file

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* exec_reset.c :+: :+: :+: */ /* exec_destroy.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/08 14:31:42 by jhalford #+# #+# */ /* Created: 2017/03/27 03:09:58 by jhalford #+# #+# */
/* Updated: 2017/03/27 00:33:31 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:10:37 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,14 +14,8 @@
int exec_destroy(t_exec *exec) int exec_destroy(t_exec *exec)
{ {
t_jobc *jobc;
int i;
if (!exec) if (!exec)
return (0); return (0);
jobc = &data_singleton()->jobc;
ft_lstdel(&exec->op_stack, ft_lst_cfree); ft_lstdel(&exec->op_stack, ft_lst_cfree);
ft_lstdel(&jobc->first_job, job_free);
i = -1;
return (0); return (0);
} }

4
42sh/src/exec/mark_process_status.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 12:41:11 by jhalford #+# #+# */ /* Created: 2016/12/12 12:41:11 by jhalford #+# #+# */
/* Updated: 2017/03/24 17:28:45 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:08:10 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -35,6 +35,6 @@ int mark_process_status(pid_t pid, int status)
} }
return (0); return (0);
} }
SH_ERR("No child process %d", pid); SH_ERR("No child process %i", pid);
return (1); return (1);
} }

4
42sh/src/exec/redirect_greatand.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 22:12:31 by jhalford #+# #+# */ /* Created: 2017/02/06 22:12:31 by jhalford #+# #+# */
/* Updated: 2017/03/25 00:58:22 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:18:37 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -32,7 +32,7 @@ int redirect_greatand(t_redir *redir)
if (fdold > 9) if (fdold > 9)
return (bad_fd(fdold)); return (bad_fd(fdold));
if (fd_is_valid(fdold, O_WRONLY | O_RDWR)) if (fd_is_valid(fdold, O_WRONLY | O_RDWR))
fd_replace(fdold, fdnew); dup2(fdold, fdnew);
else else
return (bad_fd(fdold)); return (bad_fd(fdold));
return (0); return (0);

4
42sh/src/exec/redirect_lessand.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 22:11:18 by jhalford #+# #+# */ /* Created: 2017/02/06 22:11:18 by jhalford #+# #+# */
/* Updated: 2017/03/21 16:33:43 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:18:44 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -32,7 +32,7 @@ int redirect_lessand(t_redir *redir)
if (fdold > 9) if (fdold > 9)
return (bad_fd(fdold)); return (bad_fd(fdold));
if (fd_is_valid(fdold, O_RDONLY | O_RDWR)) if (fd_is_valid(fdold, O_RDONLY | O_RDWR))
fd_replace(fdold, fdnew); dup2(fdold, fdnew);
else else
return (bad_fd(fdold)); return (bad_fd(fdold));
return (0); return (0);

5
42sh/src/job_control/job_update_status.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 12:56:11 by jhalford #+# #+# */ /* Created: 2016/12/15 12:56:11 by jhalford #+# #+# */
/* Updated: 2017/03/20 14:36:02 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:17:54 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,8 +21,7 @@ void job_update_status(void)
{ {
if ((pid = waitpid(WAIT_ANY, &status, WUNTRACED | WNOHANG)) == -1 if ((pid = waitpid(WAIT_ANY, &status, WUNTRACED | WNOHANG)) == -1
&& errno != ECHILD) && errno != ECHILD)
ft_dprintf(2, "{red}%s: waitpid error errno=%i{eoc}\n", SH_ERR("waitpid(): %s", strerror(errno));
SHELL_NAME, errno);
if (pid <= 1 || mark_process_status(pid, status)) if (pid <= 1 || mark_process_status(pid, status))
break ; break ;
} }

20
42sh/src/job_control/jobc_destroy.c Normal file
View file

@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* jobc_destroy.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/27 03:09:41 by jhalford #+# #+# */
/* Updated: 2017/03/27 03:10:55 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
int jobc_destroy(t_jobc *jobc)
{
if (jobc)
ft_lstdel(&jobc->first_job, job_free);
return (0);
}

3
42sh/src/main/data_exit.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/07 18:07:50 by jhalford #+# #+# */ /* Created: 2016/12/07 18:07:50 by jhalford #+# #+# */
/* Updated: 2017/03/27 00:36:29 by jhalford ### ########.fr */ /* Updated: 2017/03/27 03:11:57 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,6 +26,7 @@ void data_exit(void)
lexer_destroy(&data->lexer); lexer_destroy(&data->lexer);
parser_destroy(&data->parser); parser_destroy(&data->parser);
exec_destroy(&data->exec); exec_destroy(&data->exec);
jobc_destroy(&data->jobc);
i = -1; i = -1;
while (++i < 10) while (++i < 10)
ft_lstdel(&data->exec.fd_save[i], ft_lst_cfree); ft_lstdel(&data->exec.fd_save[i], ft_lst_cfree);