npm

commit fa50fe10e7d68e1be6decd1eb9724330f4c740a9
parent 1451e51c9276ceb46e1f8a0f3d3f88da2992662d
Author: Nihal Jere <nihal@nihaljere.xyz>
Date:   Tue, 12 Oct 2021 11:15:45 -0500

npm-agent: use do while to read master password

So we don't have to set ret = -1. Also memchr now
only searches the most recently read data for a newline

Diffstat:
M
npm-agent.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/npm-agent.c b/npm-agent.c
@@ -65,17 +65,18 @@ xwrite(int fd, char *buf, size_t count)
 int
 read_to_nl(int fd, char *buf)
 {
-	ssize_t ret = -1;
+	ssize_t ret;
 	size_t len = 0;
 	char *ptr = buf;
-	while (ret && len <= PASSWORD_MAX_LEN && !memchr(buf, '\n', len)) {
+
+	do {
 		ret = read(fd, ptr, PASSWORD_MAX_LEN - len);
 		if (ret == -1)
 			return ret;
 
 		len += ret;
 		ptr += ret;
-	}
+	} while (ret && len <= PASSWORD_MAX_LEN && !memchr(ptr, '\n', ret));
 
 	return len;
 }