listener: Cygwin fix.

We cannot pass raw C wide literals to static_str; this breaks
on platforms where wchar_t is two bytes and strings are
aligned to only two byte boundaries. That's why TXR has the
wli() macro.  We don't want to introduce the wli() macro into
linenoise, so the two choices are: duplicate the incoming mode
strings into dynamic storage with string(), or pass some enum
to specify file mode and locally convert to static mode
string. Let's go with the latter.

* linenoise.c (edit_in_editor, lino_hist_save): Use enum
constant for file mode instead of mode string.

* linenoise.h (enum lino_file_mode, line_file_mode_t):
New enum.
(struct lino_os): File opening functions use lino_file_mode_t
instead of mode string.

* parser.c (lino_mode_str): New static array.
(lino_open, lino_open8, lino_fdopen): Take enum mode instead
of string.  Convert to literal through lino_mode_str table,
and pass that literal to static_str.

1 files changed, 10 insertions, 6 deletions

diff --git a/parser.c b/parser.c
index 575ea1e3..ddd72fd1 100644
--- a/parser.c
+++ b/parser.c
@@ -1489,23 +1489,27 @@ static int lino_feof(mem_t *stream_in)
   return get_error(stream) == t;
 }
 
-static mem_t *lino_open(const wchar_t *name_in, const wchar_t *mode_in)
+static const wchli_t *lino_mode_str[] = {
+  wli("r"), wli("w")
+};
+
+static mem_t *lino_open(const wchar_t *name_in, lino_file_mode_t mode_in)
 {
   val name = string(name_in);
-  val mode = static_str(coerce(const wchli_t *, mode_in));
+  val mode = static_str(lino_mode_str[mode_in]);
   return coerce(mem_t *, open_file(name, mode));
 }
 
-static mem_t *lino_open8(const char *name_in, const wchar_t *mode_in)
+static mem_t *lino_open8(const char *name_in, lino_file_mode_t mode_in)
 {
   val name = string_utf8(name_in);
-  val mode = static_str(coerce(const wchli_t *, mode_in));
+  val mode = static_str(lino_mode_str[mode_in]);
   return coerce(mem_t *, open_file(name, mode));
 }
 
-static mem_t *lino_fdopen(int fd, const wchar_t *mode_in)
+static mem_t *lino_fdopen(int fd, lino_file_mode_t mode_in)
 {
-  val mode = static_str(coerce(const wchli_t *, mode_in));
+  val mode = static_str(lino_mode_str[mode_in]);
   return coerce(mem_t *, open_fileno(num(fd), mode));
 }