diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-06-30 14:15:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 14:15:35 -0400 |
| commit | 7805a54cff11923d9fc9f26e770f9470e5d36e97 (patch) | |
| tree | 84105105cf5e902ea385192aeb4f0ddb8857b45c /tools/knarc/Narc.cpp | |
| parent | 03974b502c8591fee4c705a482a6ed9ba9a6acbf (diff) | |
| parent | dd3fb084c96e5afdefce7541a05289c6cc96f5dc (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'tools/knarc/Narc.cpp')
| -rw-r--r-- | tools/knarc/Narc.cpp | 11 |
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) { |