summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-11-03 23:17:40 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-11-03 23:17:40 +0000
commitfa3f806cd0730ddc53765f04a846087b99db847a (patch)
treec76e82b7f511a099cb1c107e13de57207926f89b /shell
parent43f0a0bb3a178794ac9fa3f5010db680c5d1b018 (diff)
downloadbusybox-w32-1_7_3.tar.gz
busybox-w32-1_7_3.tar.bz2
busybox-w32-1_7_3.zip
apply accumulated post 1.7.2 patches; bump version to 1.7.31_7_3
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 46f00dd3d..02cd6b77c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -4379,6 +4379,7 @@ clear_traps(void)
4379 4379
4380/* Lives far away from here, needed for forkchild */ 4380/* Lives far away from here, needed for forkchild */
4381static void closescript(void); 4381static void closescript(void);
4382
4382/* Called after fork(), in child */ 4383/* Called after fork(), in child */
4383static void 4384static void
4384forkchild(struct job *jp, union node *n, int mode) 4385forkchild(struct job *jp, union node *n, int mode)
@@ -4423,15 +4424,8 @@ forkchild(struct job *jp, union node *n, int mode)
4423 setsignal(SIGQUIT); 4424 setsignal(SIGQUIT);
4424 setsignal(SIGTERM); 4425 setsignal(SIGTERM);
4425 } 4426 }
4426#if JOBS
4427 /* For "jobs | cat" to work like in bash, we must retain list of jobs
4428 * in child, but we do need to remove ourself */
4429 if (jp)
4430 freejob(jp);
4431#else
4432 for (jp = curjob; jp; jp = jp->prev_job) 4427 for (jp = curjob; jp; jp = jp->prev_job)
4433 freejob(jp); 4428 freejob(jp);
4434#endif
4435 jobless = 0; 4429 jobless = 0;
4436} 4430}
4437 4431