From aa98692ffb56e8f5607f7035d496b907e8650cf4 Mon Sep 17 00:00:00 2001
From: Andreas Schulz <ats@FreeBSD.org>
Date: Sun, 29 Jan 1995 01:19:25 +0000
Subject: [PATCH] Correct a name of one structure member in the sigaltstack
 structure. Now it matches the man page and also the only other commercial
 implementation i have found so far ( Solaris 2.x). Changed the name from
 ss_base to ss_sp.

---
 sys/amd64/amd64/machdep.c | 4 ++--
 sys/i386/i386/machdep.c   | 4 ++--
 sys/kern/kern_sig.c       | 8 ++++----
 sys/sys/_sigset.h         | 4 ++--
 sys/sys/signal.h          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index d0d6d97c5361..1e2fef08b875 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.103 1995/01/24 09:56:29 davidg Exp $
+ *	$Id: machdep.c,v 1.104 1995/01/25 21:40:17 bde Exp $
  */
 
 #include "npx.h"
@@ -498,7 +498,7 @@ sendsig(catcher, sig, mask, code)
         if ((psp->ps_flags & SAS_ALTSTACK) &&
 	    (psp->ps_sigstk.ss_flags & SA_ONSTACK) == 0 &&
 	    (psp->ps_sigonstack & sigmask(sig))) {
-		fp = (struct sigframe *)(psp->ps_sigstk.ss_base +
+		fp = (struct sigframe *)(psp->ps_sigstk.ss_sp +
 		    psp->ps_sigstk.ss_size - sizeof(struct sigframe));
 		psp->ps_sigstk.ss_flags |= SA_ONSTACK;
 	} else {
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index d0d6d97c5361..1e2fef08b875 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.103 1995/01/24 09:56:29 davidg Exp $
+ *	$Id: machdep.c,v 1.104 1995/01/25 21:40:17 bde Exp $
  */
 
 #include "npx.h"
@@ -498,7 +498,7 @@ sendsig(catcher, sig, mask, code)
         if ((psp->ps_flags & SAS_ALTSTACK) &&
 	    (psp->ps_sigstk.ss_flags & SA_ONSTACK) == 0 &&
 	    (psp->ps_sigonstack & sigmask(sig))) {
-		fp = (struct sigframe *)(psp->ps_sigstk.ss_base +
+		fp = (struct sigframe *)(psp->ps_sigstk.ss_sp +
 		    psp->ps_sigstk.ss_size - sizeof(struct sigframe));
 		psp->ps_sigstk.ss_flags |= SA_ONSTACK;
 	} else {
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index e644649256b9..7a593497b797 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.7 1994/10/10 01:00:47 phk Exp $
+ * $Id: kern_sig.c,v 1.8 1994/11/06 11:13:02 ache Exp $
  */
 
 #define	SIGPROP		/* include signal properties table */
@@ -230,7 +230,7 @@ execsigs(p)
 	 */
 	ps->ps_sigstk.ss_flags = SA_DISABLE;
 	ps->ps_sigstk.ss_size = 0;
-	ps->ps_sigstk.ss_base = 0;
+	ps->ps_sigstk.ss_sp = 0;
 	ps->ps_flags = 0;
 }
 
@@ -440,14 +440,14 @@ osigstack(p, uap, retval)
 	int error = 0;
 
 	psp = p->p_sigacts;
-	ss.ss_sp = psp->ps_sigstk.ss_base;
+	ss.ss_sp = psp->ps_sigstk.ss_sp;
 	ss.ss_onstack = psp->ps_sigstk.ss_flags & SA_ONSTACK;
 	if (uap->oss && (error = copyout((caddr_t)&ss, (caddr_t)uap->oss,
 	    sizeof (struct sigstack))))
 		return (error);
 	if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
 	    sizeof (ss))) == 0) {
-		psp->ps_sigstk.ss_base = ss.ss_sp;
+		psp->ps_sigstk.ss_sp = ss.ss_sp;
 		psp->ps_sigstk.ss_size = 0;
 		psp->ps_sigstk.ss_flags |= ss.ss_onstack & SA_ONSTACK;
 		psp->ps_flags |= SAS_ALTSTACK;
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index a116e9bc7362..c26054b094a9 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: signal.h,v 1.2 1994/08/02 07:53:32 davidg Exp $
  */
 
 #ifndef	_SYS_SIGNAL_H_
@@ -145,7 +145,7 @@ typedef	void (*sig_t) __P((int));	/* type of signal function */
  * Structure used in sigaltstack call.
  */
 struct	sigaltstack {
-	char	*ss_base;		/* signal stack base */
+	char	*ss_sp;			/* signal stack base */
 	int	ss_size;		/* signal stack length */
 	int	ss_flags;		/* SA_DISABLE and/or SA_ONSTACK */
 };
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index a116e9bc7362..c26054b094a9 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: signal.h,v 1.2 1994/08/02 07:53:32 davidg Exp $
  */
 
 #ifndef	_SYS_SIGNAL_H_
@@ -145,7 +145,7 @@ typedef	void (*sig_t) __P((int));	/* type of signal function */
  * Structure used in sigaltstack call.
  */
 struct	sigaltstack {
-	char	*ss_base;		/* signal stack base */
+	char	*ss_sp;			/* signal stack base */
 	int	ss_size;		/* signal stack length */
 	int	ss_flags;		/* SA_DISABLE and/or SA_ONSTACK */
 };