Merge pull request #204 from PikalaxALT/pikalax_work

Fix CRLF handling in .knarckeep/.knarcignore

1 files changed, 10 insertions, 1 deletions

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) {