From 34869c7fec2c83ea4d06d33a11e314f215d70c6e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 30 Jun 2020 13:34:27 -0400
Subject: knarc accepts CRLF in .knarcignore

knarc now allows CRLF line endings in .knarcignore
---
 tools/knarc/Narc.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'tools/knarc/Narc.cpp')

diff --git a/tools/knarc/Narc.cpp b/tools/knarc/Narc.cpp
index 7ccdcf0e..2faed98e 100644
--- a/tools/knarc/Narc.cpp
+++ b/tools/knarc/Narc.cpp
@@ -117,7 +117,16 @@ public:
         infile.open(fp, ios_base::in);
         string line;
         while (getline(infile, line)) {
-            push_back(line);
+            if (!line.empty())
+            {
+                // strip CR
+                size_t i;
+                for (i = line.size() - 1; line[i] == '\r'; i--)
+                    ;
+                if (i < line.size() - 1)
+                    line.erase(i + 1);
+                push_back(line);
+            }
         }
     }
     bool matches(string fp) {
-- 
cgit v1.2.3