From bfe841880dddec5bf312d8657e42312b74a67c78 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 11 Jul 2021 14:56:42 -0700 Subject: [PATCH] glfw: handle windows \r\n in Apple SDK prompt Signed-off-by: Stephen Gutekanst --- glfw/build.zig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glfw/build.zig b/glfw/build.zig index 9992d29f..e3710eb1 100644 --- a/glfw/build.zig +++ b/glfw/build.zig @@ -261,7 +261,9 @@ fn confirmAppleSDKAgreement(allocator: *std.mem.Allocator) !bool { try stdout.print("Do you agree to those terms? [Y/n] ", .{}); if (try stdin.readUntilDelimiterOrEof(buf[0..], '\n')) |user_input| { try stdout.print("\n", .{}); - return std.mem.eql(u8, user_input, "y") or std.mem.eql(u8, user_input, "Y") or std.mem.eql(u8, user_input, "yes") or std.mem.eql(u8, user_input, ""); + var in = user_input; + if (in[in.len-1] == '\r') in = in[0..in.len-1]; + return std.mem.eql(u8, in, "y") or std.mem.eql(u8, in, "Y") or std.mem.eql(u8, in, "yes") or std.mem.eql(u8, in, ""); } else { return false; }