From a110dd51bd843fa9790ef83f030a6c03a0aa86d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radovan=20Garab=C3=ADk?=
 <radovan.garabik-github@kassiopeia.juls.savba.sk>
Date: Sat, 4 Nov 2017 21:14:07 +0100
Subject: [PATCH] better fix end of line stripping; strip whitespaces

---
 colourfiles/conf.docker-machinels | 2 +-
 colourfiles/conf.gcc              | 8 ++++----
 colourfiles/conf.ip               | 2 +-
 colourfiles/conf.irclog           | 2 +-
 colourfiles/conf.ldap             | 2 +-
 colourfiles/conf.pv               | 2 +-
 grcat                             | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/colourfiles/conf.docker-machinels b/colourfiles/conf.docker-machinels
index 61dbb4b..6c03050 100644
--- a/colourfiles/conf.docker-machinels
+++ b/colourfiles/conf.docker-machinels
@@ -16,7 +16,7 @@ colours=red
 ======
 # PORTS
 regexp=((?:\d{1,3}\.){3}\d{1,3}):(\d+)
-colours=default,blue,bold blue 
+colours=default,blue,bold blue
 ======
 # Error Line
 regexp=^error\s(?:\w+\s)+([a-z\-_0-9]+):(.*)$
diff --git a/colourfiles/conf.gcc b/colourfiles/conf.gcc
index 9523a4f..8754b3e 100644
--- a/colourfiles/conf.gcc
+++ b/colourfiles/conf.gcc
@@ -1,9 +1,9 @@
-# 
+#
 regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
 colours=white bold
 count=once
 .........
-# 
+#
 regexp=^[^:\s]*?:\d+:
 colours=bold magenta
 .........
@@ -11,7 +11,7 @@ regexp=^[^:\s]*?:
 colours=cyan
 count=once
 .........
-# 
+#
 regexp=\`[A-Za-z0-9_():&*]+( const)?\'
 colours=magenta
 .........
@@ -28,7 +28,7 @@ regexp=\-o\s[^\s]+
 colours=yellow
 .........
 # warning and error won't work, unless you redirect also
-# stderr to grcat 
+# stderr to grcat
 #
 # warning
 regexp=[Ww]arning[:\b]
diff --git a/colourfiles/conf.ip b/colourfiles/conf.ip
index e248789..c8a5e1d 100644
--- a/colourfiles/conf.ip
+++ b/colourfiles/conf.ip
@@ -36,7 +36,7 @@ colours=red
 # "linkdown"
 regexp=linkdown
 colours=bold red
-- 
+-
 
 # "src"
 regexp=src \S+
diff --git a/colourfiles/conf.irclog b/colourfiles/conf.irclog
index b76da48..1baa5ed 100644
--- a/colourfiles/conf.irclog
+++ b/colourfiles/conf.irclog
@@ -24,7 +24,7 @@ colours=bold green
 =======
 # everything in parentheses
 regexp=\(.+?\)
-colours=green 
+colours=green
 count=more
 =======
 # channel name
diff --git a/colourfiles/conf.ldap b/colourfiles/conf.ldap
index 6b872c8..0e6f13b 100644
--- a/colourfiles/conf.ldap
+++ b/colourfiles/conf.ldap
@@ -1,5 +1,5 @@
 # Intended for colouring LDIF output (from ldap tools)
-# comments 
+# comments
 regexp=^#.*
 colours=green
 count=stop
diff --git a/colourfiles/conf.pv b/colourfiles/conf.pv
index d0fd873..33c46fd 100644
--- a/colourfiles/conf.pv
+++ b/colourfiles/conf.pv
@@ -2,7 +2,7 @@
 regexp=(\s|^)\d+([.,]\d+)?\s?([kKMG][bB]|[bB]|[kKMG])(?=[\s,]|$)
 colours=yellow
 =======
-# 
+#
 regexp=<=>
 colours=yellow
 
diff --git a/grcat b/grcat
index 51a3083..2f50d25 100755
--- a/grcat
+++ b/grcat
@@ -135,7 +135,7 @@ while not is_last:
             continue
         if not l[0] in letters:
             break
-        fields = split(l.strip(), "=", 1)
+        fields = split(l.rstrip('\r\n'), "=", 1)
         if len(fields) != 2:
             sys.stderr.write('Error in configuration, I expect keyword=value line\n')
             sys.stderr.write('But I got instead:\n')