[gnome-builder] utils: take \r into account for line reading

[Christian Hergert <chergert src gnome org>]

commit 2509a84526b50aeef391ed78c1d20584688afe99
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jan 8 17:48:33 2018 -0800

    utils: take \r into account for line reading
    
    This also includes a test for the condition.

 src/libide/util/ide-line-reader.c |    3 ++
 src/tests/meson.build             |    6 ++++
 src/tests/test-line-reader.c      |   59 +++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 0 deletions(-)
---
diff --git a/src/libide/util/ide-line-reader.c b/src/libide/util/ide-line-reader.c
index 1872705..9fdca6f 100644
--- a/src/libide/util/ide-line-reader.c
+++ b/src/libide/util/ide-line-reader.c
@@ -80,6 +80,9 @@ ide_line_reader_next (IdeLineReader *reader,
       if (reader->contents [reader->pos] == '\n')
         {
           *length = &reader->contents [reader->pos] - ret;
+          /* Ingore the \r in \r\n if provided */
+          if (*length > 0 && reader->pos > 0 && reader->contents [reader->pos - 1] == '\r')
+            (*length)--;
           reader->pos++;
           return ret;
         }
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 177a839..d5f1cd3 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -165,3 +165,9 @@ test_ide_glib = executable('test-ide-glib', 'test-ide-glib.c',
   dependencies: [ ide_test_deps ],
 )
 test('test-ide-glib', test_ide_glib, env: ide_test_env)
+
+test_line_reader = executable('test-line-reader', 'test-line-reader.c',
+  c_args: ide_test_cflags,
+  dependencies: [ ide_test_deps ],
+)
+test('test-line-reader', test_line_reader, env: ide_test_env)
diff --git a/src/tests/test-line-reader.c b/src/tests/test-line-reader.c
new file mode 100644
index 0000000..10bbcae
--- /dev/null
+++ b/src/tests/test-line-reader.c
@@ -0,0 +1,59 @@
+/* test-line-reader.c
+ *
+ * Copyright © 2018 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <ide.h>
+#include <string.h>
+
+static void
+test_line_reader_basic (void)
+{
+  IdeLineReader reader;
+  gchar *str;
+  gsize len;
+
+  ide_line_reader_init (&reader, (gchar *)"a\nb\nc\r\nd\ne", -1);
+
+  str = ide_line_reader_next (&reader, &len);
+  g_assert_cmpint (len, ==, 1);
+  g_assert (strncmp (str, "a", 1) == 0);
+
+  str = ide_line_reader_next (&reader, &len);
+  g_assert_cmpint (len, ==, 1);
+  g_assert (strncmp (str, "b", 1) == 0);
+
+  str = ide_line_reader_next (&reader, &len);
+  g_assert_cmpint (len, ==, 1);
+  g_assert (strncmp (str, "c", 1) == 0);
+
+  str = ide_line_reader_next (&reader, &len);
+  g_assert_cmpint (len, ==, 1);
+  g_assert (strncmp (str, "d", 1) == 0);
+
+  str = ide_line_reader_next (&reader, &len);
+  g_assert_cmpint (len, ==, 1);
+  g_assert (strncmp (str, "e", 1) == 0);
+}
+
+gint
+main (gint   argc,
+      gchar *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+  g_test_add_func ("/Ide/LineReader/basic", test_line_reader_basic);
+  return g_test_run ();
+}