zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-05-06 04:21:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Coding style and const fixes to last PR"

Browse Source 
This reverts commit fbb1f8800a.
This commit is contained in:
Joachim Nilsson 2018-11-15 10:26:03 +01:00
parent fbb1f8800a
commit 66d8ae84e2
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/cli.c
View File

@ -117,21 +117,31 @@ el_status_t do_suspend(void)
return CSstay; return CSstay;
} }
static int my_rl_check_secret(const char *line) static int my_rl_check_secret(const char* source)
{ {
const char *pattern = (char *)"^unlock\\s"; const char* pattern = (char *)"^unlock\\s";
regex_t regex; regex_t regex;
int rc = 0;
if (!line || regcomp(&regex, pattern, 0)) int reti;
return 0; int rez = 0;
if (!regexec(&regex, line, 0, NULL, 0)) if (!pattern || !source)
rc = 1; return rez;
/* Compile regular expression */
reti = regcomp(&regex, pattern, 0);
if (reti) // If couldn't compile regex
return rez;
/* Execute regular expression */
reti = regexec(&regex, source, 0, NULL, 0);
if (!reti) // If regex match
rez = 1;
/* Free memory allocated to the pattern buffer by regcomp() */
regfree(&regex); regfree(&regex);
return rc; return rez;
} }
int main(void) int main(void)

2
include/editline.h
View File

@ -77,7 +77,7 @@ extern char *rl_complete(char *token, int *match);
extern int rl_list_possib(char *token, char ***av); extern int rl_list_possib(char *token, char ***av);
extern char **rl_completion_matches(const char *token, rl_compentry_func_t *generator); extern char **rl_completion_matches(const char *token, rl_compentry_func_t *generator);
extern char *rl_filename_completion_function(const char *text, int state); extern char *rl_filename_completion_function(const char *text, int state);
extern int rl_check_secret(const char *source); extern int rl_check_secret(char *source);
/* For compatibility with FSF readline. */ /* For compatibility with FSF readline. */
extern int rl_point; extern int rl_point;

11
src/complete.c
View File

@ -398,22 +398,17 @@ char *rl_complete(char *token, int *match)
} }
static rl_check_secret_func_t *el_check_secret_func = NULL; static rl_check_secret_func_t *el_check_secret_func = NULL;
/* For compatibility with the Heimdal project. */
/* Added for the BitShares Core project. */
rl_check_secret_func_t *rl_set_check_secret_func(rl_check_secret_func_t *func) rl_check_secret_func_t *rl_set_check_secret_func(rl_check_secret_func_t *func)
{ {
rl_check_secret_func_t *old = el_check_secret_func; rl_check_secret_func_t *old = el_check_secret_func;
el_check_secret_func = func; el_check_secret_func = func;
return old; return old;
} }
int rl_check_secret(char *source)
int rl_check_secret(const char *line)
{ {
if (el_check_secret_func) if (el_check_secret_func)
return el_check_secret_func(line); return el_check_secret_func(source);
return 0; return 0;
} }

2
src/editline.c
View File

@ -1138,7 +1138,7 @@ static void hist_add(const char *p)
if (s == NULL) if (s == NULL)
return; return;
/* Don't add secret information in history */ // Don't add secret information in history
if (rl_check_secret(s)) if (rl_check_secret(s))
return; return;