summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorEric Andersen2002-04-24 23:14:06 +0000
committerEric Andersen2002-04-24 23:14:06 +0000
commit54c14d7850e57503e872a659fd4125e041def652 (patch)
tree87d3a9745468011139c0466bfad6c078fc026ec5 /shell
parentae1036185e5707fd309825a6fed764089e9f5d43 (diff)
downloadbusybox-54c14d7850e57503e872a659fd4125e041def652.zip
busybox-54c14d7850e57503e872a659fd4125e041def652.tar.gz
vodz noted this line (as imported from Debian) is wrong, and has since
been fixed upstream.
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index c77bfec..e721c4e 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6754,7 +6754,7 @@ waitforjob(struct job *jp)
if (!iflag) {
#endif
sigaction(SIGINT, &oact, 0);
- if (intreceived && trap[SIGINT]) kill(getpid(), SIGINT);
+ if (intreceived) kill(getpid(), SIGINT);
}
#ifdef CONFIG_ASH_JOB_CONTROL
if (jp->jobctl) {
@@ -12433,7 +12433,7 @@ findvar(struct var **vpp, const char *name)
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin.
- * $Id: ash.c,v 1.47 2002/04/13 05:37:10 timr Exp $
+ * $Id: ash.c,v 1.48 2002/04/24 23:12:10 andersen Exp $
*/
static int timescmd (int argc, char **argv)
{