From f024d444d299de331f8a9c932e479fedfbba6c5e Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sat, 7 Nov 2015 17:58:55 +0000
Subject: Modernization, no functional change intended: Use the POSIX function
 getline(3) rather than the slightly dangerous BSD function fgetln(3). Remove
 the related compatibility code.

---
 manpath.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'manpath.c')

diff --git a/manpath.c b/manpath.c
index ec108db4..7b15533a 100644
--- a/manpath.c
+++ b/manpath.c
@@ -212,14 +212,19 @@ manconf_file(struct manconf *conf, const char *file)
 	char manpath_default[] = MANPATH_DEFAULT;
 
 	FILE		*stream;
-	char		*cp, *ep;
-	size_t		 len, tok;
+	char		*line, *cp, *ep;
+	size_t		 linesz, tok, toklen;
+	ssize_t		 linelen;
 
 	if ((stream = fopen(file, "r")) == NULL)
 		goto out;
 
-	while ((cp = fgetln(stream, &len)) != NULL) {
-		ep = cp + len;
+	line = NULL;
+	linesz = 0;
+
+	while ((linelen = getline(&line, &linesz, stream)) != -1) {
+		cp = line;
+		ep = cp + linelen;
 		if (ep[-1] != '\n')
 			break;
 		*--ep = '\0';
@@ -229,11 +234,11 @@ manconf_file(struct manconf *conf, const char *file)
 			continue;
 
 		for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
-			len = strlen(toks[tok]);
-			if (cp + len < ep &&
-			    isspace((unsigned char)cp[len]) &&
-			    !strncmp(cp, toks[tok], len)) {
-				cp += len;
+			toklen = strlen(toks[tok]);
+			if (cp + toklen < ep &&
+			    isspace((unsigned char)cp[toklen]) &&
+			    strncmp(cp, toks[tok], toklen) == 0) {
+				cp += toklen;
 				while (isspace((unsigned char)*cp))
 					cp++;
 				break;
@@ -259,6 +264,7 @@ manconf_file(struct manconf *conf, const char *file)
 			break;
 		}
 	}
+	free(line);
 	fclose(stream);
 
 out:
-- 
cgit