emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few more structural updates for job control.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-05-08 05:11:54 +00:00
parent 0a36de0580
commit 1a6d39b259
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hush.c
View File

@ -1089,11 +1089,21 @@ static void insert_bg_job(struct pipe *pi)
thejob->next = NULL; thejob->next = NULL;
thejob->running_progs = thejob->num_progs; thejob->running_progs = thejob->num_progs;
thejob->stopped_progs = 0; thejob->stopped_progs = 0;
thejob->text = xmalloc(MAX_LINE);
//if (pi->progs[0] && pi->progs[0].argv && pi->progs[0].argv[0])
{
char *bar=thejob->text;
char **foo=pi->progs[0].argv;
while(foo && *foo) {
bar += sprintf(bar, "%s ", *foo++);
}
}
/* we don't wait for background thejobs to return -- append it /* we don't wait for background thejobs to return -- append it
to the list of backgrounded thejobs and leave it alone */ to the list of backgrounded thejobs and leave it alone */
printf("[%d] %d\n", pi->jobid, pi->pgrp); printf("[%d] %d\n", thejob->jobid, thejob->progs[0].pid);
last_bg_pid = pi->pgrp; last_bg_pid = thejob->progs[0].pid;
} }
/* remove a backgrounded job from a jobset */ /* remove a backgrounded job from a jobset */
@ -1169,8 +1179,7 @@ static void checkjobs()
pi->progs[prognum].is_stopped = 1; pi->progs[prognum].is_stopped = 1;
if (pi->stopped_progs == pi->num_progs) { if (pi->stopped_progs == pi->num_progs) {
printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text);
pi->text);
} }
} }
} }

17
shell/hush.c
View File

@ -1089,11 +1089,21 @@ static void insert_bg_job(struct pipe *pi)
thejob->next = NULL; thejob->next = NULL;
thejob->running_progs = thejob->num_progs; thejob->running_progs = thejob->num_progs;
thejob->stopped_progs = 0; thejob->stopped_progs = 0;
thejob->text = xmalloc(MAX_LINE);
//if (pi->progs[0] && pi->progs[0].argv && pi->progs[0].argv[0])
{
char *bar=thejob->text;
char **foo=pi->progs[0].argv;
while(foo && *foo) {
bar += sprintf(bar, "%s ", *foo++);
}
}
/* we don't wait for background thejobs to return -- append it /* we don't wait for background thejobs to return -- append it
to the list of backgrounded thejobs and leave it alone */ to the list of backgrounded thejobs and leave it alone */
printf("[%d] %d\n", pi->jobid, pi->pgrp); printf("[%d] %d\n", thejob->jobid, thejob->progs[0].pid);
last_bg_pid = pi->pgrp; last_bg_pid = thejob->progs[0].pid;
} }
/* remove a backgrounded job from a jobset */ /* remove a backgrounded job from a jobset */
@ -1169,8 +1179,7 @@ static void checkjobs()
pi->progs[prognum].is_stopped = 1; pi->progs[prognum].is_stopped = 1;
if (pi->stopped_progs == pi->num_progs) { if (pi->stopped_progs == pi->num_progs) {
printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", printf(JOB_STATUS_FORMAT, pi->jobid, "Stopped", pi->text);
pi->text);
} }
} }
} }