From dc881bd3d93c18c83c1c7b53fb172c0d334078c8 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Wed, 12 Mar 2014 08:54:29 +0000
Subject: Make ministat CRNL tolerant by stripping all isspace() from the tail
 end of input lines.

---
 usr.bin/ministat/ministat.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/ministat/ministat.c b/usr.bin/ministat/ministat.c
index 218715c..c8d8e12 100644
--- a/usr.bin/ministat/ministat.c
+++ b/usr.bin/ministat/ministat.c
@@ -13,6 +13,7 @@ __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <math.h>
+#include <ctype.h>
 #include <err.h>
 #include <string.h>
 #include <stdlib.h>
@@ -475,8 +476,8 @@ ReadSet(const char *n, int column, const char *delim)
 		line++;
 
 		i = strlen(buf);
-		if (buf[i-1] == '\n')
-			buf[i-1] = '\0';
+		while (i > 0 && isspace(buf[i - 1]))
+			buf[--i] = '\0';
 		for (i = 1, t = strtok(buf, delim);
 		     t != NULL && *t != '#';
 		     i++, t = strtok(NULL, delim)) {
-- 
cgit v1.1