From 39a7e043a9a1b07aaf2badd9f29c81c59b69e4a0 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sat, 28 May 2016 13:44:13 +0000
Subject: Trim trailing whitespace from man.conf lines; patch from millert@.

---
 manpath.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/manpath.c b/manpath.c
index 0627f13d..83c329ec 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.29 2015/11/07 17:58:55 schwarze Exp $	*/
+/*	$Id: manpath.c,v 1.30 2016/05/28 13:44:13 schwarze Exp $	*/
 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -224,13 +224,12 @@ manconf_file(struct manconf *conf, const char *file)
 
 	while ((linelen = getline(&line, &linesz, stream)) != -1) {
 		cp = line;
-		ep = cp + linelen;
-		if (ep[-1] != '\n')
-			break;
-		*--ep = '\0';
+		ep = cp + linelen - 1;
+		while (ep > cp && isspace((unsigned char)*ep))
+			*ep-- = '\0';
 		while (isspace((unsigned char)*cp))
 			cp++;
-		if (*cp == '#')
+		if (cp == ep || *cp == '#')
 			continue;
 
 		for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
-- 
cgit v1.2.3-56-ge451