Merge pull request #9 from DavidKinder/master

Fix further instances of ISO-Latin-1 / UTF-8 mixed up
This commit is contained in:
Graham Nelson 2022-05-01 22:04:10 +01:00 committed by GitHub
commit ab132fcd9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -597,18 +597,18 @@ void Streams::write_as_UTF8_string(char *C_string, text_stream *stream, int buff
=
int Streams::open_from_locale_string(text_stream *stream, const char *C_string) {
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
return Streams::open_from_UTF8_string(stream, C_string);
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
return Streams::open_from_UTF8_string(stream, C_string);
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
return Streams::open_from_ISO_string(stream, C_string);
Errors::fatal("unknown command line locale");
return FALSE;
}
void Streams::write_as_locale_string(char *C_string, text_stream *stream, int buffer_size) {
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
Streams::write_as_UTF8_string(C_string, stream, buffer_size);
else if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
else if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
Streams::write_as_ISO_string(C_string, stream, buffer_size);
else Errors::fatal("unknown command line locale");
}