d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an inefficiency I introduced in my last commit.

Browse Source 
Include "expand.h" vom memalloc.c to pull function declartion into scope
This commit is contained in:
Martin Cracauer 1998-09-10 14:51:06 +00:00
parent d30ada6d4b
commit e6ac45dde2
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/sh/memalloc.c
View File

@ -39,7 +39,7 @@
static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95"; static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: memalloc.c,v 1.9 1998/05/18 06:43:57 charnier Exp $"; "$Id: memalloc.c,v 1.10 1998/09/06 21:13:09 tegge Exp $";
#endif /* not lint */ #endif /* not lint */
#include "shell.h" #include "shell.h"
@ -48,6 +48,7 @@ static const char rcsid[] =
#include "error.h" #include "error.h"
#include "machdep.h" #include "machdep.h"
#include "mystring.h" #include "mystring.h"
#include "expand.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

13
bin/sh/trap.c
View File

@ -39,7 +39,7 @@
static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95"; static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: trap.c,v 1.14 1998/08/25 09:33:34 cracauer Exp $"; "$Id: trap.c,v 1.15 1998/09/08 13:16:52 cracauer Exp $";
#endif /* not lint */ #endif /* not lint */
#include <signal.h> #include <signal.h>
@ -347,7 +347,6 @@ void
onsig(signo) onsig(signo)
int signo; int signo;
{ {
int i;
#ifndef BSD #ifndef BSD
signal(signo, onsig); signal(signo, onsig);
@ -368,13 +367,9 @@ onsig(signo)
* If a trap is set, we need to make sure it is executed even * If a trap is set, we need to make sure it is executed even
* when a childs blocks all signals. * when a childs blocks all signals.
*/ */
for (i = 0; i < NSIG; i++) { if (trap[signo] != NULL &&
if (signo == i && trap[i] != NULL && ! (trap[signo][0] == ':' && trap[signo][1] == '\0'))
! (trap[i][0] == ':' && trap[i][1] == '\0')) { breakwaitcmd = 1;
breakwaitcmd = 1;
break;
}
}
} }