authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-22 18:14:53-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-22 18:14:53-04:00
logf14ba904d78a9edb6f7dcf89f70b9c0be346a0fb
tree1a1b35f4f998736302132a315d6a0847fc3924f5
parent2c8495b4bb261d440bc6d1a6b0415a64c8d99222
signaturelock-open Commit is signed but in an unrecognized format.

tolerate windows newlines in glibc text files

1 files changed, 3 insertions(+), 3 deletions(-)

src/glibc.cpp+3-3
...@@ -50,7 +50,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo...@@ -50,7 +50,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo
50 }50 }
5151
52 {52 {
53 SplitIterator it = memSplit(buf_to_slice(vers_txt_contents), str("\n"));53 SplitIterator it = memSplit(buf_to_slice(vers_txt_contents), str("\r\n"));
54 for (;;) {54 for (;;) {
55 Optional<Slice<uint8_t>> opt_component = SplitIterator_next(&it);55 Optional<Slice<uint8_t>> opt_component = SplitIterator_next(&it);
56 if (!opt_component.is_some) break;56 if (!opt_component.is_some) break;
...@@ -65,7 +65,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo...@@ -65,7 +65,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo
65 }65 }
66 }66 }
67 {67 {
68 SplitIterator it = memSplit(buf_to_slice(fns_txt_contents), str("\n"));68 SplitIterator it = memSplit(buf_to_slice(fns_txt_contents), str("\r\n"));
69 for (;;) {69 for (;;) {
70 Optional<Slice<uint8_t>> opt_component = SplitIterator_next(&it);70 Optional<Slice<uint8_t>> opt_component = SplitIterator_next(&it);
71 if (!opt_component.is_some) break;71 if (!opt_component.is_some) break;
...@@ -91,7 +91,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo...@@ -91,7 +91,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo
91 }91 }
92 }92 }
93 {93 {
94 SplitIterator it = memSplit(buf_to_slice(abi_txt_contents), str("\n"));94 SplitIterator it = memSplit(buf_to_slice(abi_txt_contents), str("\r\n"));
95 ZigGLibCVerList *ver_list_base = nullptr;95 ZigGLibCVerList *ver_list_base = nullptr;
96 int line_num = 0;96 int line_num = 0;
97 for (;;) {97 for (;;) {