MSDOS fixes from Jason Hood.

gwsw · Jul 25, 2017 · f0f0eda · f0f0eda
1 parent 18e0088
commit f0f0eda
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/charset.c b/charset.c
@@ -814,7 +814,7 @@ is_ubin_char(ch)
  * Consider it binary if it can't be converted.
  */
  BOOL used_default = TRUE;
- WideCharToMultiByte(CP_OEMCP, 0, (LPCWSTR) &ch, 1, NULL, 0, NULL, &used_default);
+ WideCharToMultiByte(GetConsoleOutputCP(), WC_NO_BEST_FIT_CHARS, (LPCWSTR) &ch, 1, NULL, 0, NULL, &used_default);
  if (used_default)
  ubin = 1;
  }

diff --git a/cmdbuf.c b/cmdbuf.c
@@ -1218,7 +1218,7 @@ cmd_char(c)
  if (IS_ASCII_OCTET(c))
  cmd_mbc_buf_len = 1;
 #if MSDOS_COMPILER || OS2
- else if (c == '\340' && IS_ASCII_OCTET(peekcc()))
+ else if (c == (unsigned char) '\340' && IS_ASCII_OCTET(peekcc()))
  {
  /* Assume a special key. */
  cmd_mbc_buf_len = 1;

diff --git a/filename.c b/filename.c
@@ -674,7 +674,7 @@ lglob(filename)
  char *p;
  int len;
  int n;
- char *filename;
+ char *pfilename;
  char *qfilename;
  DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle)
 
@@ -690,10 +690,10 @@ lglob(filename)
  p = gfilename;
  do {
  n = (int) (strlen(drive) + strlen(dir) + strlen(fnd.GLOB_NAME) + 1);
- filename = (char *) ecalloc(n, sizeof(char));
- SNPRINTF3(filename, n, "%s%s%s", drive, dir, fnd.GLOB_NAME);
- qfilename = shell_quote(filename);
- free(filename);
+ pfilename = (char *) ecalloc(n, sizeof(char));
+ SNPRINTF3(pfilename, n, "%s%s%s", drive, dir, fnd.GLOB_NAME);
+ qfilename = shell_quote(pfilename);
+ free(pfilename);
  if (qfilename != NULL)
  {
  n = (int) strlen(qfilename);
@@ -952,7 +952,7 @@ close_altfile(altfilename, filename)
  return;
  if (num_pct_s(lessclose) > 2) 
  {
- error("LESSCLOSE ignored; must contain no more than 2 %s", NULL_PARG);
+ error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG);
  return;
  }
  len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2);

diff --git a/line.c b/line.c
@@ -1012,16 +1012,6 @@ do_append(ch, rep, pos)
  STORE_CHAR(*s, AT_BINARY, NULL, pos);
  } else
  {
-#if MSDOS_COMPILER==WIN32C
- if (utf_mode == 2 && ch < 0x10000)
- {
- char mb[4];
- int i;
- int len = WideCharToMultiByte(CP_OEMCP, 0, (LPCWSTR) &ch, 1, mb, 4, NULL, NULL);
- for (i = 0; i < len; i++)
- STORE_CHAR(mb[i], a, NULL, pos);
- } else
-#endif
  STORE_CHAR(ch, a, rep, pos);
  }
  return (0);

diff --git a/main.c b/main.c
@@ -186,15 +186,16 @@ main(argc, argv)
  struct textlist tlist;
  char *filename;
  char *gfilename;
+ char *qfilename;
 
  gfilename = lglob(*argv++);
  init_textlist(&tlist, gfilename);
  filename = NULL;
  while ((filename = forw_textlist(&tlist, filename)) != NULL)
  {
- filename = shell_unquote(filename);
- (void) get_ifile(filename, ifile);
- free(filename);
+ qfilename = shell_unquote(filename);
+ (void) get_ifile(qfilename, ifile);
+ free(qfilename);
  ifile = prev_ifile(NULL_IFILE);
  }
  free(gfilename);

diff --git a/screen.c b/screen.c
@@ -128,7 +128,7 @@ static void win32_deinit_term();
 #define MAKEATTR(fg,bg) ((WORD)((fg)|((bg)<<4)))
 #define SETCOLORS(fg,bg) { curr_attr = MAKEATTR(fg,bg); \
  if (SetConsoleTextAttribute(con_out, curr_attr) == 0) \
- error("SETCOLORS failed"); }
+ error("SETCOLORS failed", NULL_PARG); }
 #endif
 
 #if MSDOS_COMPILER
@@ -2501,7 +2501,18 @@ WIN32textout(text, len)
 {
 #if MSDOS_COMPILER==WIN32C
  DWORD written;
- WriteConsole(con_out, text, len, &written, NULL);
+ if (utf_mode == 2)
+ {
+ /*
+ * We've got UTF-8 text in a non-UTF-8 console. Convert it to
+ * wide and use WriteConsoleW.
+ */
+ WCHAR wtext[1024];
+ len = MultiByteToWideChar(CP_UTF8, 0, text, len, wtext,
+ sizeof(wtext)/sizeof(*wtext));
+ WriteConsoleW(con_out, wtext, len, &written, NULL);
+ } else
+ WriteConsole(con_out, text, len, &written, NULL);
 #else
  char c = text[len];
  text[len] = '\0';