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

cleaned up debug macros before merge

Browse source
This commit is contained in:
Jack Halford 2017-02-02 01:20:51 +01:00
parent 0d8610ca65
commit da592565e0
6 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,12 +23,8 @@ int process_setgroup(t_process *p, pid_t pid)
j = &data_singleton()->exec.job; j = &data_singleton()->exec.job;
if (!j->pgid) if (!j->pgid)
j->pgid = pid ? pid : getpid(); j->pgid = pid ? pid : getpid();
DG("pid:%i gonna setpgid(%i, %i)", getpid(), pid, j->pgid);
setpgid(pid, j->pgid); setpgid(pid, j->pgid);
if (pid == 0 && JOB_IS_FG(j->attributes)) if (pid == 0 && JOB_IS_FG(j->attributes))
{
DG("pid:%i gonna setpgrp(%i)", getpid(), j->pgid);
tcsetpgrp(STDIN, j->pgid); tcsetpgrp(STDIN, j->pgid);
}
return (0); return (0);
} }

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

@ -18,7 +18,6 @@ void job_format_head(t_job *j)
int rank[2]; int rank[2];
job_getrank(&rank); job_getrank(&rank);
DG("rank[0]=%i,rank[1]=%i", rank[0], rank[1]);
if (j->id == rank[0]) if (j->id == rank[0])
crank = '+'; crank = '+';
else if (j->id == rank[1]) else if (j->id == rank[1])

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

@ -24,11 +24,9 @@ void job_getrank(int (*rank)[2])
jlist = jobc->first_job; jlist = jobc->first_job;
(*rank)[0] = 0; (*rank)[0] = 0;
(*rank)[1] = 0; (*rank)[1] = 0;
DG("check 1");
while (jlist && i < 2) while (jlist && i < 2)
{ {
job = jlist->content; job = jlist->content;
DG("check 2: id=%i", job->id);
if (job_is_stopped(job->id)) if (job_is_stopped(job->id))
(*rank)[i++] = job->id; (*rank)[i++] = job->id;
jlist = jlist->next; jlist = jlist->next;

1
42sh/src/job-control/job_wait.c
View file

@ -17,7 +17,6 @@ int job_wait(int id)
pid_t pid; pid_t pid;
int status; int status;
DG("waiting for [%i]", id);
if (job_is_stopped(id)) if (job_is_stopped(id))
return (0); return (0);
job_update_status(); job_update_status();

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

@ -17,7 +17,6 @@ int put_job_in_foreground(t_job *j, int cont)
t_jobc *jobc; t_jobc *jobc;
jobc = &data_singleton()->jobc; jobc = &data_singleton()->jobc;
DG("pid:%i gonna setpgrp(%i) (JOB)", getpid(), j->pgid);
tcsetpgrp(STDIN, j->pgid); tcsetpgrp(STDIN, j->pgid);
tcsetattr(STDIN, TCSADRAIN, &jobc->shell_tmodes); tcsetattr(STDIN, TCSADRAIN, &jobc->shell_tmodes);
@ -28,10 +27,8 @@ int put_job_in_foreground(t_job *j, int cont)
DG("kill(SIGCONT) failed"); DG("kill(SIGCONT) failed");
} }
job_wait(j->id); job_wait(j->id);
DG("finished waiting for [%i]", j->id);
job_remove(j->id); job_remove(j->id);
DG("pid:%i gonna setpgrp(%i) (SHELL)", getpid(), jobc->shell_pgid);
tcsetpgrp(STDIN, jobc->shell_pgid); tcsetpgrp(STDIN, jobc->shell_pgid);
tcgetattr(STDIN, &j->tmodes); tcgetattr(STDIN, &j->tmodes);

1
42sh/src/main/main.c
View file

@ -28,7 +28,6 @@ int shell_single_command(char *command)
return (0); return (0);
if (ft_post_tokenize(&token, command)) if (ft_post_tokenize(&token, command))
return (1); return (1);
DG("after post_tokenize");
token_print(token); token_print(token);
if (ft_parse(&ast, &token)) if (ft_parse(&ast, &token))
return (1); return (1);