From a5ef87836c9dba23c187e361a70dddef87c03746 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 30 Oct 2017 06:56:03 -0700 Subject: streams: allow "b" flag on open-command. Currently, using "rb" in open-command reports an error on GNU/Linux, due to popen not liking the "b" mode. On Cygwin, the "b" flag is useful with popen. * stream.c (normalize_mode_no_bin): New function. (open_command): Use normalize_mode_no_bin instead of normalize_mode to strip out the binary flag. This doesn't happen on Cygwin, though. * stream.h (normalize_mode_no_bin): Declared. * share/txr/stdlib/getput.tl (command-get-buf): Since we are getting binary data, pass the "rb" mode to open-command, now that it works. (command-put-buf): Add "b" flag to mode passed to open-command. --- stream.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index 2af67db2..9c4f40d5 100644 --- a/stream.c +++ b/stream.c @@ -1446,6 +1446,22 @@ val normalize_mode(struct stdio_mode *m, val mode_str, struct stdio_mode m_dfl) return format_mode(*m); } +val normalize_mode_no_bin(struct stdio_mode *m, val mode_str, struct stdio_mode m_dfl) +{ +#ifdef __CYGWIN__ + return normalize_mode(m, mode_str, m_dfl); +#else + *m = do_parse_mode(mode_str, m_dfl); + + if (m->malformed) + uw_throwf(file_error_s, lit("invalid file open mode ~a"), mode_str, nao); + + m->binary = 0; + + return format_mode(*m); +#endif +} + val set_mode_props(const struct stdio_mode m, val stream) { if (m.interactive || m.linebuf || m.unbuf || m.buforder != -1) { @@ -3857,7 +3873,7 @@ static void fds_restore(struct save_fds *fds) val open_command(val path, val mode_str) { struct stdio_mode m, m_r = stdio_mode_init_r; - val mode = normalize_mode(&m, mode_str, m_r); + val mode = normalize_mode_no_bin(&m, mode_str, m_r); int input = m.read != 0; struct save_fds sfds; FILE *f = 0; -- cgit v1.2.3