From 57e734c248f443d9b15580e4daddf37b45e001b2 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Thu, 10 Jan 2019 19:51:50 -0500
Subject: Replace sys_nsig with NSIG

---
 bin/cash/kill.c | 8 ++++----
 bin/cash/trap.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/cash/kill.c b/bin/cash/kill.c
index 9526f3d3..f58987cc 100644
--- a/bin/cash/kill.c
+++ b/bin/cash/kill.c
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
 				errx(2, "illegal signal number: %s", *argv);
 			if (numsig >= 128)
 				numsig -= 128;
-			if (numsig <= 0 || numsig >= sys_nsig)
+			if (numsig <= 0 || numsig >= NSIG)
 				nosig(*argv);
 			printf("%s\n", sys_signame[numsig]);
 			return (0);
@@ -164,7 +164,7 @@ signame_to_signum(const char *sig)
 
 	if (strncasecmp(sig, "SIG", 3) == 0)
 		sig += 3;
-	for (n = 1; n < sys_nsig; n++) {
+	for (n = 1; n < NSIG; n++) {
 		if (!strcasecmp(sys_signame[n], sig))
 			return (n);
 	}
@@ -189,9 +189,9 @@ printsignals(FILE *fp)
 {
 	int n;
 
-	for (n = 1; n < sys_nsig; n++) {
+	for (n = 1; n < NSIG; n++) {
 		(void)fprintf(fp, "%s", sys_signame[n]);
-		if (n == (sys_nsig / 2) || n == (sys_nsig - 1))
+		if (n == (NSIG / 2) || n == (NSIG - 1))
 			(void)fprintf(fp, "\n");
 		else
 			(void)fprintf(fp, " ");
diff --git a/bin/cash/trap.c b/bin/cash/trap.c
index 9809770d..93c063e1 100644
--- a/bin/cash/trap.c
+++ b/bin/cash/trap.c
@@ -111,7 +111,7 @@ sigstring_to_signum(char *sig)
 
 		if (strncasecmp(sig, "SIG", 3) == 0)
 			sig += 3;
-		for (n = 1; n < sys_nsig; n++)
+		for (n = 1; n < NSIG; n++)
 			if (sys_signame[n] &&
 			    strcasecmp(sys_signame[n], sig) == 0)
 				return (n);
@@ -129,7 +129,7 @@ printsignals(void)
 	int n, outlen;
 
 	outlen = 0;
-	for (n = 1; n < sys_nsig; n++) {
+	for (n = 1; n < NSIG; n++) {
 		if (sys_signame[n]) {
 			out1fmt("%s", sys_signame[n]);
 			outlen += strlen(sys_signame[n]);
@@ -138,7 +138,7 @@ printsignals(void)
 			outlen += 3;	/* good enough */
 		}
 		++outlen;
-		if (outlen > 71 || n == sys_nsig - 1) {
+		if (outlen > 71 || n == NSIG - 1) {
 			out1str("\n");
 			outlen = 0;
 		} else {
@@ -169,7 +169,7 @@ trapcmd(int argc __unused, char **argv)
 	argv = argptr;
 
 	if (*argv == NULL) {
-		for (signo = 0 ; signo < sys_nsig ; signo++) {
+		for (signo = 0 ; signo < NSIG ; signo++) {
 			if (signo < NSIG && trap[signo] != NULL) {
 				out1str("trap -- ");
 				out1qstr(trap[signo]);
-- 
cgit 1.4.1