giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

opensc-explorer: refactor read_cmdline() 

* add comments
* simplify #ifdef logic
* increase commandline buffer in non-interactive / non-readline case
This commit is contained in:
Peter Marschall 2018-07-22 11:03:23 +02:00 committed by Frank Morgner
parent ca9538761b
commit c5679bfe39
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools/opensc-explorer.c
View File

@ -2049,7 +2049,7 @@ static int parse_cmdline(char *in, char **argv, int argvsize)
static char *read_cmdline(FILE *script, char *prompt) static char *read_cmdline(FILE *script, char *prompt)
{ {
static char buf[256]; static char buf[SC_MAX_EXT_APDU_BUFFER_SIZE];
static int initialized; static int initialized;
static int interactive; static int interactive;
@ -2061,20 +2061,23 @@ static char *read_cmdline(FILE *script, char *prompt)
using_history(); using_history();
#endif #endif
} }
#ifdef ENABLE_READLINE
if (interactive) { if (interactive) {
#ifdef ENABLE_READLINE
char *line = readline(prompt); char *line = readline(prompt);
if (line && strlen(line) > 2 )
/* add line to history if longer than 2 characters */
if (line != NULL && strlen(line) > 2)
add_history(line); add_history(line);
/* return in interactive case with readline */
return line; return line;
} #else
#endif
/* Either we don't have readline or we are not running
interactively */
#ifndef ENABLE_READLINE
if (interactive)
printf("%s", prompt); printf("%s", prompt);
#endif #endif
}
/* either we don't have readline or we are not running interactively */
fflush(stdout); fflush(stdout);
if (fgets(buf, sizeof(buf), script) == NULL) if (fgets(buf, sizeof(buf), script) == NULL)
return NULL; return NULL;