Merge pull request #152 from Liuchang0812/master

fix: Consider Windows-style LRLF in flag parsing

Merge pull request #152 from Liuchang0812/master
fix: Consider Windows-style LRLF in flag parsing
546819b1 · Andreas Schuh · GitHub · ac1a925c · 0c17f1ee · 546819b1
Commit 546819b1 authored Jun 28, 2016 by Andreas Schuh Committed by GitHub Jun 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

gflags.cc src/gflags.cc +5 -1

No files found.
--- a/src/gflags.cc
+++ b/src/gflags.cc
@@ -1278,7 +1278,11 @@ string CommandLineFlagParser::ProcessOptionsFromStringLocked(
  for (; line_end; flagfile_contents = line_end + 1) {
    while (*flagfile_contents && isspace(*flagfile_contents))
      ++flagfile_contents;
-    line_end = strchr(flagfile_contents, '\n');
+    // Windows uses "\r\n"
+    line_end = strchr(flagfile_contents, '\r');
+    if (line_end == NULL)
+        line_end = strchr(flagfile_contents, '\n');
+
    size_t len = line_end ? line_end - flagfile_contents
                          : strlen(flagfile_contents);
    string line(flagfile_contents, len);