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

correction de la norme sur tout le moude job-control

Browse source
This commit is contained in:
Jack Halford 2017-01-31 15:11:26 +01:00
parent e2e18d83bc
commit e7e93fa533
26 changed files with 146 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
42sh/includes/job_control.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */
/* Updated: 2017/01/09 16:56:18 by jhalford ### ########.fr */
/* Updated: 2017/01/31 14:40:08 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -53,8 +53,8 @@ void job_update_rank(void);
int do_job_notification(void);
void job_notify_new(t_job *job);
void job_notify_change(int id);
void job_format(t_job *j, int rank[2], int opts);
void job_format_head(t_job *j, int rank[2]);
void job_format(t_job *j, int opts);
void job_format_head(t_job *j);
void job_update_status(void);
void mark_job_as_running (t_job *j);

2
42sh/src/glob/glob.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/04 16:29:54 by wescande #+# #+# */
/* Updated: 2017/01/30 12:08:49 by wescande ### ########.fr */
/* Updated: 2017/01/31 14:16:38 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/glob/glob_print.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/05 16:09:40 by wescande #+# #+# */
/* Updated: 2017/01/31 13:43:56 by jhalford ### ########.fr */
/* Updated: 2017/01/31 13:52:43 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/job-control/builtin_fg.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/08 14:30:07 by jhalford #+# #+# */
/* Updated: 2017/01/11 14:42:04 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:05:31 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

95
42sh/src/job-control/builtin_jobs.c
View file

@ -6,43 +6,100 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 17:43:01 by jhalford #+# #+# */
/* Updated: 2017/01/11 14:38:50 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:05:34 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
int builtin_jobs(const char *path, char *const av[], char *const envp[])
static int bt_jobs_parse(char **av, int *i)
{
t_jobc *jobc;
t_list *jlist;
t_list *tmplist;
int rank[2];
int opts;
int opts;
int j;
(void)path;
(void)envp;
(void)av;
if (!SHELL_HAS_JOBC(data_singleton()->opts))
opts = 0;
*i = 1;
while (av[*i])
{
ft_dprintf(2, "{red}jobs: %s{eoc}\n", SHELL_MSG_NOJOBC);
return (-1);
j = 0;
if (av[*i][j++] != '-')
break ;
while (av[*i][j])
{
if (av[*i][j] == 'l')
opts |= JOBS_OPTS_L;
else
{
ft_dprintf(2, "{red}%s: bad option: -%c{eoc}\n",
SHELL_NAME, av[*i][j]);
return (-1);
}
j++;
}
(*i)++;
}
return (opts);
}
static void bt_jobs_all(int opts)
{
t_jobc *jobc;
t_list *jlist;
t_list *tmplist;
jobc = &data_singleton()->jobc;
jlist = jobc->first_job;
job_getrank(&rank);
opts = 0;
if (ft_strcmp(av[1], "-l") == 0)
opts |= JOBS_OPTS_L;
tmplist = ft_lst_filter(jlist, NULL, NULL);
ft_lstsort(&tmplist, job_cmp_id);
jlist = tmplist;
while (jlist)
{
job_format(jlist->content, rank, opts);
job_format(jlist->content, opts);
jlist = jlist->next;
}
ft_lstdel(&tmplist, ft_lst_cfree);
}
static int bt_jobs_spec(char **av, int opts)
{
t_jobc *jobc;
t_list *jlist;
t_list *lst;
int id;
jobc = &data_singleton()->jobc;
jlist = jobc->first_job;
while (*av)
{
id = ft_atoi(*av);
if (!(lst = ft_lst_find(jlist, &id, job_cmp_id)))
{
ft_dprintf(2, "{red}jobs: %s: no such job{eoc}\n", *av);
return (1);
}
job_format(lst->content, opts);
av++;
}
return (0);
}
int builtin_jobs(const char *path, char *const av[], char *const envp[])
{
int opts;
int i;
(void)path;
(void)envp;
if (!SHELL_HAS_JOBC(data_singleton()->opts))
{
ft_dprintf(2, "{red}jobs: %s{eoc}\n", SHELL_MSG_NOJOBC);
return (1);
}
if ((opts = bt_jobs_parse((char**)av, &i)) < 0)
return (1);
if (!av[i])
bt_jobs_all(opts);
else if (bt_jobs_spec((char **)av + i, opts))
return (1);
return (0);
}

17
42sh/src/job-control/do_job_notification.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 13:01:19 by jhalford #+# #+# */
/* Updated: 2017/01/11 17:35:15 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:06:05 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,18 +26,15 @@ int do_job_notification(void)
while (jlist)
{
j = jlist->content;
DG("checking [%i]", j->id);
if (job_is_completed(j->id))
if (job_is_completed(j->id)
|| (job_is_stopped(j->id) && !(j->attributes & JOB_NOTIFIED)))
{
ret = 1;
job_notify_change(j->id);
job_remove(j->id);
}
else if (job_is_stopped(j->id) && !(j->attributes & JOB_NOTIFIED))
{
ret = 1;
job_notify_change(j->id);
j->attributes |= JOB_NOTIFIED;
if (job_is_completed(j->id))
job_remove(j->id);
else
j->attributes |= JOB_NOTIFIED;
}
jlist = jlist->next;
}

4
42sh/src/job-control/job_addprocess.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:54:51 by jhalford #+# #+# */
/* Updated: 2017/01/11 14:40:34 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:07:16 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -33,5 +33,5 @@ int job_addprocess(t_process *p)
}
if (JOB_IS_BG(job->attributes) && IS_PIPEEND(p->attributes))
job_notify_new(job);
return(0);
return (0);
}

3
42sh/src/job-control/job_cmp_id.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 13:38:13 by jhalford #+# #+# */
/* Updated: 2017/01/10 11:08:46 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:06:26 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,4 +16,3 @@ int job_cmp_id(t_job *job, int *id)
{
return (job->id - *id);
}

10
42sh/src/job-control/job_format.c
View file

@ -1,23 +1,23 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* job_format.c :+: :+: :+: */
/* job_format.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 12:47:17 by jhalford #+# #+# */
/* Updated: 2017/01/10 11:16:50 by jhalford ### ########.fr */
/* Created: 2017/01/31 15:06:44 by jhalford #+# #+# */
/* Updated: 2017/01/31 15:06:57 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
void job_format(t_job *j, int rank[2], int opts)
void job_format(t_job *j, int opts)
{
t_list *plist;
int firstp;
job_format_head(j, rank);
job_format_head(j);
plist = j->first_process;
firstp = 1;
while (plist)

7
42sh/src/job-control/job_format_head.c
View file

@ -6,16 +6,19 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:10:38 by jhalford #+# #+# */
/* Updated: 2017/01/09 13:53:48 by jhalford ### ########.fr */
/* Updated: 2017/01/31 14:53:13 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
void job_format_head(t_job *j, int rank[2])
void job_format_head(t_job *j)
{
char crank;
int rank[2];
job_getrank(&rank);
DG("rank[0]=%i,rank[1]=%i", rank[0], rank[1]);
if (j->id == rank[0])
crank = '+';
else if (j->id == rank[1])

12
42sh/src/job-control/job_getprocess.c
View file

@ -1,3 +1,15 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* job_getprocess.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/31 15:07:30 by jhalford #+# #+# */
/* Updated: 2017/01/31 15:07:41 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
t_process *job_getprocess(pid_t pid)

4
42sh/src/job-control/job_getrank.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 12:38:31 by jhalford #+# #+# */
/* Updated: 2017/01/10 10:30:20 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:04:33 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,9 +24,11 @@ void job_getrank(int (*rank)[2])
jlist = jobc->first_job;
(*rank)[0] = 0;
(*rank)[1] = 0;
DG("check 1");
while (jlist && i < 2)
{
job = jlist->content;
DG("check 2: id=%i", job->id);
if (job_is_stopped(job->id))
(*rank)[i++] = job->id;
jlist = jlist->next;

2
42sh/src/job-control/job_is_completed.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 15:10:20 by jhalford #+# #+# */
/* Updated: 2017/01/31 13:50:40 by jhalford ### ########.fr */
/* Updated: 2017/01/31 13:52:36 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

6
42sh/src/job-control/job_notify_change.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 15:04:03 by jhalford #+# #+# */
/* Updated: 2017/01/10 11:16:17 by jhalford ### ########.fr */
/* Updated: 2017/01/31 14:46:48 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,10 +16,8 @@ void job_notify_change(int id)
{
t_job *job;
t_jobc *jobc;
int rank[2];
jobc = &data_singleton()->jobc;
job = ft_lst_find(jobc->first_job, &id, job_cmp_id)->content;
job_getrank(&rank);
job_format(job, rank, JOBS_OPTS_L);
job_format(job, JOBS_OPTS_L);
}

7
42sh/src/job-control/job_run.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 16:54:18 by jhalford #+# #+# */
/* Updated: 2017/01/11 14:37:23 by jhalford ### ########.fr */
/* Updated: 2017/01/31 14:47:26 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,10 +14,7 @@
void job_run(t_job *job, int foreground)
{
int rank[2];
job_getrank(&rank);
mark_job_as_running(job);
job_format(job, rank, JOBS_OPTS_L);
job_format(job, JOBS_OPTS_L);
foreground ? put_job_in_foreground(job, 1) : put_job_in_background(job, 1);
}

6
42sh/src/job-control/job_update_status.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 12:56:11 by jhalford #+# #+# */
/* Updated: 2017/01/10 12:33:09 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:07:51 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,7 +17,7 @@ void job_update_status(void)
int status;
pid_t pid;
pid = waitpid (WAIT_ANY, &status, WUNTRACED | WNOHANG);
pid = waitpid(WAIT_ANY, &status, WUNTRACED | WNOHANG);
while (!process_mark_status(pid, status))
pid = waitpid (WAIT_ANY, &status, WUNTRACED | WNOHANG);
pid = waitpid(WAIT_ANY, &status, WUNTRACED | WNOHANG);
}

4
42sh/src/job-control/mark_job_as_running.c
View file

@ -6,13 +6,13 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/08 14:40:40 by jhalford #+# #+# */
/* Updated: 2017/01/10 10:52:36 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:08:11 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
void mark_job_as_running (t_job *j)
void mark_job_as_running(t_job *j)
{
t_list *plist;
t_process *p;

2
42sh/src/job-control/process_cmp_pid.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 13:00:21 by jhalford #+# #+# */
/* Updated: 2016/12/12 13:40:13 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:06:21 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

4
42sh/src/job-control/process_format.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:05:55 by jhalford #+# #+# */
/* Updated: 2017/01/12 13:16:45 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:10:56 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -64,7 +64,7 @@ static void process_format_com_short(t_list **plist, t_flag state)
p = (*plist)->content;
if (!(p->attributes & state) ||
(state == PROCESS_COMPLETED && p->status != 0))
break;
break ;
if (p->attributes & PROCESS_CONTINUED)
{
p->attributes &= ~PROCESS_STATE_MASK;

8
42sh/src/job-control/process_mark_status.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 12:41:11 by jhalford #+# #+# */
/* Updated: 2017/01/31 13:44:49 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:10:04 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -32,11 +32,11 @@ int process_mark_status(pid_t pid, int status)
p->attributes |= PROCESS_COMPLETED;
if (WIFSIGNALED(status))
ft_printf("{mag}%d: Terminated by signal %d.\n{eoc}",
(int) pid, WTERMSIG(p->status));
(int)pid, WTERMSIG(p->status));
}
return(0);
return (0);
}
ft_dprintf(2, "No child process %d.\n", pid);
}
return(-1);
return (-1);
}

9
42sh/src/job-control/put_job_in_background.c
View file

@ -6,17 +6,16 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 15:03:29 by jhalford #+# #+# */
/* Updated: 2017/01/08 13:24:53 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:09:06 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
int put_job_in_background(t_job *job, int cont)
int put_job_in_background(t_job *job, int cont)
{
/* Send the job a continue signal, if necessary. */
if (cont)
if (kill (-job->pgid, SIGCONT) < 0)
perror ("kill (SIGCONT)");
if (kill(-job->pgid, SIGCONT) < 0)
perror("kill (SIGCONT)");
return (0);
}

6
42sh/src/job-control/put_job_in_foreground.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 14:58:36 by jhalford #+# #+# */
/* Updated: 2017/01/31 13:47:41 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:10:45 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,9 +21,9 @@ int put_job_in_foreground(t_job *job, int cont)
{
signal(SIGTTOU, SIG_IGN);
if (tcsetpgrp(STDIN, job->pgid) == -1)
DG("couldn't put process in control. errno=%i, pgid=%i", errno, job->pgid);
return (1);
signal(SIGTTOU, sigttou_handler);
tcsetattr (STDIN, TCSANOW, &job->tmodes);
tcsetattr(STDIN, TCSANOW, &job->tmodes);
if (kill(-job->pgid, SIGCONT) < 0)
perror("kill (SIGCONT)");
}

7
42sh/src/job-control/sigchld_handler.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 17:37:56 by jhalford #+# #+# */
/* Updated: 2017/01/10 17:59:28 by jhalford ### ########.fr */
/* Updated: 2017/01/31 15:09:29 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,9 +18,4 @@ void sigchld_handler(int signo)
(void)signo;
data = data_singleton();
/* DG("got SIGCHLD"); */
/* if (do_job_notification()) */
/* ft_putstr(SHELL_PROMPT); */
/* if (data_singleton()->mode != MODE_EXEC) */
/* job_update_status(); */
}

2
42sh/src/line-editing/check_backslash.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/26 13:32:52 by gwojda #+# #+# */
/* Updated: 2017/01/26 13:50:00 by gwojda ### ########.fr */
/* Updated: 2017/01/31 15:03:59 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

3
42sh/src/line-editing/prompt.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:51:33 by gwojda #+# #+# */
/* Updated: 2017/01/25 16:31:24 by gwojda ### ########.fr */
/* Updated: 2017/01/31 15:02:39 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -54,6 +54,7 @@ void ft_prompt(void)
{
int ret;
do_job_notification();
ft_get_date();
ft_putstr("\033[22;36m");
ret = ft_currend_dir();

2
42sh/src/line-editing/readline.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 14:19:48 by gwojda #+# #+# */
/* Updated: 2017/01/26 13:38:29 by gwojda ### ########.fr */
/* Updated: 2017/01/31 15:04:02 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */