mirror of
				https://github.com/troglobit/editline.git
				synced 2025-10-31 08:18:11 +08:00 
			
		
		
		
	Revert "Coding style and const fixes to last PR"
This reverts commit fbb1f8800a.
			
			
This commit is contained in:
		| @@ -117,21 +117,31 @@ el_status_t do_suspend(void) | ||||
|     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; | ||||
|     int rc = 0; | ||||
|  | ||||
|     if (!line || regcomp(®ex, pattern, 0)) | ||||
|         return 0; | ||||
|     int reti; | ||||
|     int rez = 0; | ||||
|  | ||||
|     if (!regexec(®ex, line, 0, NULL, 0)) | ||||
|         rc = 1; | ||||
|     if (!pattern || !source) | ||||
|         return rez; | ||||
|  | ||||
|     /* Compile regular expression */ | ||||
|     reti = regcomp(®ex, pattern, 0); | ||||
|     if (reti) // If couldn't compile regex | ||||
|         return rez; | ||||
|  | ||||
|     /* Execute regular expression */ | ||||
|     reti = regexec(®ex, source, 0, NULL, 0); | ||||
|     if (!reti) // If regex match | ||||
|         rez = 1; | ||||
|  | ||||
|     /* Free memory allocated to the pattern buffer by regcomp() */ | ||||
|     regfree(®ex); | ||||
|  | ||||
|     return rc; | ||||
|     return rez; | ||||
| } | ||||
|  | ||||
| int main(void) | ||||
|   | ||||
| @@ -77,7 +77,7 @@ extern char       *rl_complete(char *token, int *match); | ||||
| 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_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. */ | ||||
| extern int         rl_point; | ||||
|   | ||||
| @@ -398,22 +398,17 @@ char *rl_complete(char *token, int *match) | ||||
| } | ||||
|  | ||||
| static rl_check_secret_func_t *el_check_secret_func = NULL; | ||||
|  | ||||
| /* Added for the BitShares Core project. */ | ||||
| /* For compatibility with the Heimdal project. */ | ||||
| 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; | ||||
|  | ||||
|     el_check_secret_func = func; | ||||
|  | ||||
|     return old; | ||||
| } | ||||
|  | ||||
| int rl_check_secret(const char *line) | ||||
| int rl_check_secret(char *source) | ||||
| { | ||||
|     if (el_check_secret_func) | ||||
| 	     return el_check_secret_func(line); | ||||
|  | ||||
| 	     return el_check_secret_func(source); | ||||
|     return 0; | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -1138,7 +1138,7 @@ static void hist_add(const char *p) | ||||
|     if (s == NULL) | ||||
|         return; | ||||
|  | ||||
|     /* Don't add secret information in history */ | ||||
|     // Don't add secret information in history | ||||
|     if (rl_check_secret(s)) | ||||
|         return; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Joachim Nilsson
					Joachim Nilsson