CPunch/Laika
1
0
Fork 0
mirror of https://github.com/CPunch/Laika.git synced 2024-11-22 04:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Shell: Support for spaces in arguments

Browse Source 
- Just like a normal shell, any space after a '\' will be treated as a raw space and not a command delimiter
- minor refactoring
This commit is contained in:
CPunch 2022-06-09 20:57:57 -05:00
parent 87f5eaa694
commit fb464f579f
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
shell/src/scmd.c
View File

@ -32,14 +32,14 @@ int shellS_readInt(char *str) {
/* ===========================================[[ Command Handlers ]]============================================= */ /* ===========================================[[ Command Handlers ]]============================================= */
void helpCMD(tShell_client *client, int args, char *argc[]); void helpCMD(tShell_client *client, int argc, char *argv[]);
void quitCMD(tShell_client *client, int args, char *argc[]) { void quitCMD(tShell_client *client, int argc, char *argv[]) {
PRINTINFO("Killing socket...\n"); PRINTINFO("Killing socket...\n");
laikaS_kill(&client->peer->sock); laikaS_kill(&client->peer->sock);
} }
void listPeersCMD(tShell_client *client, int args, char *argc[]) { void listPeersCMD(tShell_client *client, int argc, char *argv[]) {
int i; int i;
for (i = 0; i < client->peerTblCount; i++) { for (i = 0; i < client->peerTblCount; i++) {
@ -50,14 +50,14 @@ void listPeersCMD(tShell_client *client, int args, char *argc[]) {
} }
} }
void infoCMD(tShell_client *client, int args, char *argc[]) { void infoCMD(tShell_client *client, int argc, char *argv[]) {
tShell_peer *peer; tShell_peer *peer;
int id; int id;
if (args < 2) if (argc < 2)
CMD_ERROR("Usage: info [PEER_ID]\n"); CMD_ERROR("Usage: info [PEER_ID]\n");
id = shellS_readInt(argc[1]); id = shellS_readInt(argv[1]);
peer = shellS_getPeer(client, id); peer = shellS_getPeer(client, id);
/* print info */ /* print info */
@ -65,15 +65,15 @@ void infoCMD(tShell_client *client, int args, char *argc[]) {
shellP_printInfo(peer); shellP_printInfo(peer);
} }
void openShellCMD(tShell_client *client, int args, char *argc[]) { void openShellCMD(tShell_client *client, int argc, char *argv[]) {
uint8_t buf[LAIKA_SHELL_DATA_MAX_LENGTH]; uint8_t buf[LAIKA_SHELL_DATA_MAX_LENGTH];
tShell_peer *peer; tShell_peer *peer;
int id, sz, cols, rows; int id, sz, cols, rows;
if (args < 2) if (argc < 2)
CMD_ERROR("Usage: shell [PEER_ID]\n"); CMD_ERROR("Usage: shell [PEER_ID]\n");
id = shellS_readInt(argc[1]); id = shellS_readInt(argv[1]);
peer = shellS_getPeer(client, id); peer = shellS_getPeer(client, id);
PRINTINFO("Opening shell on peer %04d...\n"); PRINTINFO("Opening shell on peer %04d...\n");
@ -136,7 +136,7 @@ tShell_cmdDef *shellS_findCmd(char *cmd) {
return NULL; return NULL;
} }
void helpCMD(tShell_client *client, int args, char *argc[]) { void helpCMD(tShell_client *client, int argc, char *argv[]) {
int i; int i;
shellT_printf("======= [[ %sCommand List%s ]] =======\n", shellT_getForeColor(TERM_BRIGHT_YELLOW), shellT_getForeColor(TERM_BRIGHT_WHITE)); shellT_printf("======= [[ %sCommand List%s ]] =======\n", shellT_getForeColor(TERM_BRIGHT_YELLOW), shellT_getForeColor(TERM_BRIGHT_WHITE));
@ -156,13 +156,23 @@ void shellS_cleanupCmds(void) {
char **shellS_splitCmd(char *cmd, int *argSize) { char **shellS_splitCmd(char *cmd, int *argSize) {
int argCount = 0; int argCount = 0;
int argCap = 4; int argCap = 4;
char *temp;
char **args = NULL; char **args = NULL;
char *arg = cmd; char *arg = cmd;
do { do {
/* replace space with NULL terminator */ /* replace space with NULL terminator */
if (arg != cmd) if (arg != cmd) {
if (arg[-1] == '\\') { /* space is part of the argument */
/* remove the '\' character */
for (temp = arg-1; *temp != '\0'; temp++) {
temp[0] = temp[1];
}
arg++;
continue;
}
*arg++ = '\0'; *arg++ = '\0';
}
/* insert into our 'args' array */ /* insert into our 'args' array */
laikaM_growarray(char*, args, 1, argCount, argCap); laikaM_growarray(char*, args, 1, argCount, argCap);