summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/csh/csh.c6
-rw-r--r--bin/csh/sem.c14
2 files changed, 6 insertions, 14 deletions
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 0066c6a314d..309ca119c84 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.13 2000/10/30 17:16:45 millert Exp $ */
+/* $OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-static char rcsid[] = "$OpenBSD: csh.c,v 1.13 2000/10/30 17:16:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $";
#endif
#endif /* not lint */
@@ -881,6 +881,8 @@ static void
phup(sig)
int sig;
{
+ /* XXX sigh, everything after this is a signal race */
+
rechist();
/*
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 62d27452e5f..857f03afe97 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.7 2001/05/11 18:38:44 mickey Exp $ */
+/* $OpenBSD: sem.c,v 1.8 2001/06/22 21:07:35 deraadt Exp $ */
/* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: sem.c,v 1.7 2001/05/11 18:38:44 mickey Exp $";
+static char rcsid[] = "$OpenBSD: sem.c,v 1.8 2001/06/22 21:07:35 deraadt Exp $";
#endif
#endif /* not lint */
@@ -465,16 +465,6 @@ static void
vffree(i)
int i;
{
- register Char **v;
-
- if ((v = gargv) != NULL) {
- gargv = 0;
- xfree((ptr_t) v);
- }
- if ((v = pargv) != NULL) {
- pargv = 0;
- xfree((ptr_t) v);
- }
_exit(i);
}