From f14ba904d78a9edb6f7dcf89f70b9c0be346a0fb Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 22 Sep 2019 18:14:53 -0400 Subject: [PATCH] tolerate windows newlines in glibc text files --- src/glibc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glibc.cpp b/src/glibc.cpp index b2402bc29373d31027032d150e362da38bc6e2fc..50ccf20efe87c2aa386f4e8d489ae0c5a44861c1 100644 --- a/src/glibc.cpp +++ b/src/glibc.cpp @@ -50,7 +50,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo } { - SplitIterator it = memSplit(buf_to_slice(vers_txt_contents), str("\n")); + SplitIterator it = memSplit(buf_to_slice(vers_txt_contents), str("\r\n")); for (;;) { Optional> opt_component = SplitIterator_next(&it); if (!opt_component.is_some) break; @@ -65,7 +65,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo } } { - SplitIterator it = memSplit(buf_to_slice(fns_txt_contents), str("\n")); + SplitIterator it = memSplit(buf_to_slice(fns_txt_contents), str("\r\n")); for (;;) { Optional> opt_component = SplitIterator_next(&it); if (!opt_component.is_some) break; @@ -91,7 +91,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo } } { - SplitIterator it = memSplit(buf_to_slice(abi_txt_contents), str("\n")); + SplitIterator it = memSplit(buf_to_slice(abi_txt_contents), str("\r\n")); ZigGLibCVerList *ver_list_base = nullptr; int line_num = 0; for (;;) { -- 2.54.0