From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 587091c0
	for <source@mdocml.bsd.lv>;
	Sat, 28 May 2016 08:44:43 -0500 (EST)
Date: Sat, 28 May 2016 08:44:43 -0500 (EST)
Message-Id: <13437474705270556672.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Trim trailing whitespace from man.conf lines; patch from 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Trim trailing whitespace from man.conf lines; patch from millert@.

Modified Files:
--------------
    mdocml:
        manpath.c

Revision Data
-------------
Index: manpath.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/manpath.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lmanpath.c -Lmanpath.c -u -p -r1.29 -r1.30
--- manpath.c
+++ manpath.c
@@ -224,13 +224,12 @@ manconf_file(struct manconf *conf, const
 
 	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++) {
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv