RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 18:33:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

accept multiple commands on prompt

Browse source
This commit is contained in:
Philippe Teuwen 2021-05-19 01:48:43 +02:00
parent 836e0fa206
commit 2b4d110836
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/src/proxmark3.c
View file

@ -217,6 +217,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
char *cmd = NULL; char *cmd = NULL;
bool execCommand = (script_cmd != NULL); bool execCommand = (script_cmd != NULL);
bool fromInteractive = false;
uint16_t script_cmd_len = 0; uint16_t script_cmd_len = 0;
if (execCommand) { if (execCommand) {
script_cmd_len = strlen(script_cmd); script_cmd_len = strlen(script_cmd);
@ -312,7 +313,7 @@ check_script:
prompt_ctx = stdinOnPipe ? PROXPROMPT_CTX_STDIN : PROXPROMPT_CTX_SCRIPTCMD; prompt_ctx = stdinOnPipe ? PROXPROMPT_CTX_STDIN : PROXPROMPT_CTX_SCRIPTCMD;
cmd = str_dup(script_cmd); cmd = str_dup(script_cmd);
if (cmd != NULL) if ((cmd != NULL) && (! fromInteractive))
printprompt = true; printprompt = true;
uint16_t len = strlen(script_cmd) + 1; uint16_t len = strlen(script_cmd) + 1;
@ -338,11 +339,12 @@ check_script:
} }
execCommand = true; execCommand = true;
stayInCommandLoop = true; stayInCommandLoop = true;
fromInteractive = false;
script_cmd = script_cmd_buf; script_cmd = script_cmd_buf;
script_cmd_len = strlen(script_cmd); script_cmd_len = strlen(script_cmd);
strcreplace(script_cmd, script_cmd_len, ';', '\0'); strcreplace(script_cmd, script_cmd_len, ';', '\0');
// remove linebreaks // remove linebreaks
strcleanrn(script_cmd_buf, sizeof(script_cmd_buf)); strcleanrn(script_cmd, script_cmd_len);
goto check_script; goto check_script;
} else { } else {
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
@ -357,7 +359,17 @@ check_script:
memcpy_filter_ansi(prompt_filtered, prompt, sizeof(prompt_filtered), !session.supports_colors); memcpy_filter_ansi(prompt_filtered, prompt, sizeof(prompt_filtered), !session.supports_colors);
g_pendingPrompt = true; g_pendingPrompt = true;
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
cmd = readline(prompt_filtered); script_cmd = readline(prompt_filtered);
if (script_cmd != NULL) {
execCommand = true;
stayInCommandLoop = true;
fromInteractive = true;
script_cmd_len = strlen(script_cmd);
strcreplace(script_cmd, script_cmd_len, ';', '\0');
// remove linebreaks
strcleanrn(script_cmd, script_cmd_len);
goto check_script;
}
#else #else
printf("%s", prompt_filtered); printf("%s", prompt_filtered);
cmd = NULL; cmd = NULL;