TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-28 11:51:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to Windows utf-8 support + one more Minecraft newline fix

Browse Source
This commit is contained in:
Tiiffi
2024-12-06 16:24:04 +02:00
parent cc77044df1
commit 2d29741691
1 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mcrcon.c
View File

@ -140,9 +140,7 @@ void sighandler(int sig)
putchar('\n'); putchar('\n');
global_connection_alive = 0; global_connection_alive = 0;
#ifndef _WIN32
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
#endif
} }
#define MAX_WAIT_TIME 600 #define MAX_WAIT_TIME 600
@ -239,6 +237,9 @@ int main(int argc, char *argv[])
old_output_codepage = GetConsoleOutputCP(); old_output_codepage = GetConsoleOutputCP();
old_input_codepage = GetConsoleCP(); old_input_codepage = GetConsoleCP();
SetConsoleOutputCP(CP_UTF8);
SetConsoleCP(CP_UTF8);
// Set the file translation mode to UTF16 // Set the file translation mode to UTF16
_setmode(_fileno(stdin), _O_U16TEXT); _setmode(_fileno(stdin), _O_U16TEXT);
#endif #endif
@ -502,20 +503,32 @@ void print_color(int color)
void packet_print(rc_packet *packet) void packet_print(rc_packet *packet)
{ {
uint8_t *data = packet->data; uint8_t *data = packet->data;
int i;
if (flag_raw_output == 1) { if (flag_raw_output == 1) {
fputs((char *) data, stdout); fputs((char *) data, stdout);
return; return;
} }
int i; // Newline fix for Minecraft
if (global_valve_protocol == false) {
const char test[] = "Unknown or incomplete command, see below for error";
size_t test_size = sizeof test - 1;
if (strncmp((char *) data, test, test_size) == 0) {
fwrite(data, test_size, 1, stdout);
putchar('\n');
data = &data[test_size];
}
}
int default_color = 0; int default_color = 0;
#ifdef _WIN32 #ifdef _WIN32
CONSOLE_SCREEN_BUFFER_INFO console_info; CONSOLE_SCREEN_BUFFER_INFO console_info;
if (GetConsoleScreenBufferInfo(console_handle, &console_info) != 0) { if (GetConsoleScreenBufferInfo(console_handle, &console_info) != 0) {
default_color = console_info.wAttributes + 0x30; default_color = console_info.wAttributes + 0x30;
} else default_color = 0x37; }
else default_color = 0x37;
#endif #endif
bool slash = false; bool slash = false;
@ -536,6 +549,7 @@ void packet_print(rc_packet *packet)
continue; continue;
} }
// Add missing slashes
if (colors_detected == false && global_minecraft_newline_fix && data[i] == '/') { if (colors_detected == false && global_minecraft_newline_fix && data[i] == '/') {
slash ? putchar('\n') : (slash = true); slash ? putchar('\n') : (slash = true);
} }
@ -739,12 +753,16 @@ int run_terminal_mode(int sock)
#endif #endif
char tmp[1]; char tmp[1];
#ifdef _WIN32
// TODO: More Windows side testing!
int result = recv(sock, tmp, sizeof(tmp), MSG_PEEK | 0);
#else
int result = recv(sock, tmp, sizeof(tmp), MSG_PEEK | MSG_DONTWAIT); int result = recv(sock, tmp, sizeof(tmp), MSG_PEEK | MSG_DONTWAIT);
#endif
if (result == 0) { if (result == 0) {
// Connection closed break; // Connection closed
break;
} }
// TODO: Check for errors too! // TODO: Check for return values and errors!
} }
} }
@ -762,6 +780,9 @@ char *utf8_getline(char *buf, int size, FILE *stream)
return NULL; return NULL;
} }
wint_t ch;
while ((ch = getwchar()) != L'\n' && ch != WEOF);
// Calculates UTF-8 buffer size // Calculates UTF-8 buffer size
int required_size = WideCharToMultiByte(CP_UTF8, 0, in, -1, NULL, 0, NULL, NULL); int required_size = WideCharToMultiByte(CP_UTF8, 0, in, -1, NULL, 0, NULL, NULL);
if (size < required_size) { if (size < required_size) {
@ -781,7 +802,11 @@ char *utf8_getline(char *buf, int size, FILE *stream)
// gets line from stdin and deals with rubbish left in the input buffer // gets line from stdin and deals with rubbish left in the input buffer
int get_line(char *buffer, int bsize) int get_line(char *buffer, int bsize)
{ {
#ifdef _WIN32
char *ret = utf8_getline(buffer, bsize, stdin);
#else
char *ret = fgets(buffer, bsize, stdin); char *ret = fgets(buffer, bsize, stdin);
#endif
if (ret == NULL) { if (ret == NULL) {
if (ferror(stdin)) { if (ferror(stdin)) {
log_error("Error %d: %s\n", errno, strerror(errno)); log_error("Error %d: %s\n", errno, strerror(errno));
@ -793,14 +818,15 @@ int get_line(char *buffer, int bsize)
// remove unwanted characters from the buffer // remove unwanted characters from the buffer
buffer[strcspn(buffer, "\r\n")] = '\0'; buffer[strcspn(buffer, "\r\n")] = '\0';
int len = strlen(buffer); int len = strlen(buffer);
// clean input buffer if needed // clean input buffer if needed
#ifndef _WIN32
if (len == bsize - 1) { if (len == bsize - 1) {
int ch; int ch;
while ((ch = getchar()) != '\n' && ch != EOF); while ((ch = getchar()) != '\n' && ch != EOF);
} }
#endif
return len; return len;
} }