Diff
Not logged in

Differences From Artifact [3b0f6b8380]:

To Artifact [01cf823920]:


1116
1117
1118
1119
1120
1121
1122
1123
1124


1125
1126
1127
1128
1129
1130


1131
1132
1133
1134
1135
1136
1137
1138
1116
1117
1118
1119
1120
1121
1122


1123
1124
1125
1126
1127
1128


1129
1130

1131
1132
1133
1134
1135
1136
1137







-
-
+
+




-
-
+
+
-







#endif
  return zValue;
}

/*
** Display UTF8 on the console.  Return the number of
** Characters written. If stdout or stderr is redirected
** to a file, so it is not a console, -1 is returned and
** nothing is written.
** to a file, -1 is returned and ** nothing is written
** to the console.
*/
int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
#ifdef _WIN32
  int nChar;
  WCHAR *zUnicode;   /* Unicode version of zUtf8 */
  char *zConsole;    /* Console version of zUtf8 */
  wchar_t *zUnicode; /* Unicode version of zUtf8 */
  DWORD dummy;
  int codepage;      /* Console code page */

  static int once = 1;
  static int istty[2];
  if( once ){
    istty[0] = _isatty(fileno(stdout));
    istty[1] = _isatty(fileno(stderr));
    once = 0;
1148
1149
1150
1151
1152
1153
1154
1155

1156
1157

1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1147
1148
1149
1150
1151
1152
1153

1154


1155















1156
1157
1158
1159
1160
1161
1162







-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-







    return 0;
  }
  nChar = MultiByteToWideChar(CP_UTF8, 0, zUtf8, nByte, zUnicode, nChar);
  if( nChar==0 ){
    free(zUnicode);
    return 0;
  }
  zUnicode[nChar] = '\0';
  zUnicode[nChar] = '\0';;
  codepage = GetConsoleCP();
  nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, 0, 0, 0, 0);
  WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE + toStdErr), zUnicode, nChar, &dummy, 0);
  zConsole = malloc( nByte + 1);
  if( zConsole==0 ){
    free(zUnicode);
    return 0;
  }
  nByte = WideCharToMultiByte(codepage, 0, zUnicode, nChar, zConsole, nByte, 0, 0);
  zConsole[nByte] = '\0';
  free(zUnicode);
  if( nByte == 0 ){
    free(zConsole);
    zConsole = 0;
    return 0;
  }
  fwrite(zConsole, 1, nByte, toStdErr ? stderr : stdout);
  fflush(toStdErr ? stderr : stdout);
  return nChar;
#else
  return -1;  /* No-op on unix */
#endif  
}

/*