source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: Trim trailing whitespace from man.conf lines; patch from
@ 2016-05-28 13:44 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2016-05-28 13:44 UTC (permalink / raw)
  To: source

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-05-28 13:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-28 13:44 mdocml: Trim trailing whitespace from man.conf lines; patch from schwarze

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).