From 1c2f9fffe7ddf464ca3f2bd70dac7db90c5b8fca Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Mon, 9 Mar 2020 04:35:23 -0400
Subject: Replace strchrnul with strchr

---
 bin/1sh/input.c | 6 ++++--
 bin/1sh/mail.c  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/1sh/input.c b/bin/1sh/input.c
index f2295a02..d4bc93df 100644
--- a/bin/1sh/input.c
+++ b/bin/1sh/input.c
@@ -224,7 +224,8 @@ again:
 	p = parsefile->buf + (parsenextc - parsefile->buf);
 	end = p + parselleft;
 	*end = '\0';
-	q = strchrnul(p, '\n');
+	q = strchr(p, '\n');
+	if (!q) q = strchr(p, '\0');
 	if (q != end && *q == '\0') {
 		/* delete nul characters */
 		for (r = q; q != end; q++) {
@@ -236,7 +237,8 @@ again:
 			goto again;
 		end = p + parselleft;
 		*end = '\0';
-		q = strchrnul(p, '\n');
+		q = strchr(p, '\n');
+		if (!q) q = strchr(p, '\0');
 	}
 	if (q == end) {
 		parsenleft = parselleft;
diff --git a/bin/1sh/mail.c b/bin/1sh/mail.c
index 8c6b59ae..01b370c6 100644
--- a/bin/1sh/mail.c
+++ b/bin/1sh/mail.c
@@ -87,7 +87,8 @@ chkmail(int silent)
 		p = mpath;
 		if (*p == '\0')
 			break;
-		mpath = strchrnul(mpath, ':');
+		mpath = strchr(p, ':');
+		if (!mpath) mpath = strchr(p, '\0');
 		if (*mpath != '\0') {
 			*mpath++ = '\0';
 			if (p == mpath - 1)
-- 
cgit 1.4.1