diff options
| author | Sean Bright <sean@malleable.com> | 2008-10-04 16:20:31 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-10-04 16:20:31 +0000 |
| commit | 6855b63d4422267cec25163a583650b8ad71684c (patch) | |
| tree | 47979cc3ae7d1376e27a2ab561595b0c702fe234 /main/asterisk.c | |
| parent | 36a3fb92fd455d1260ead3e6f6db21a763f5a148 (diff) | |
Fix a bug with the last item in CLI history getting duplicated when
read from the .asterisk_history file (and subsequently being duplicated
when written). We weren't checking the result of fgets() which meant
that we read the same line twice before feof() actually returned non-
zero.
Also, stop writing out an extra blank line between each item in the
history file, fix a minor off-by-one error, and use symbolic constants
rather than a hardcoded integer.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@146359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 0aa9f9a3d..6f04c82c7 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2371,15 +2371,17 @@ static int ast_el_initialize(void) return 0; } +#define MAX_HISTORY_COMMAND_LENGTH 256 + static int ast_el_add_history(char *buf) { HistEvent ev; if (el_hist == NULL || el == NULL) ast_el_initialize(); - if (strlen(buf) > 256) + if (strlen(buf) > (MAX_HISTORY_COMMAND_LENGTH - 1)) return 0; - return (history(el_hist, &ev, H_ENTER, buf)); + return (history(el_hist, &ev, H_ENTER, ast_strip(ast_strdupa(buf)))); } static int ast_el_write_history(char *filename) @@ -2394,7 +2396,7 @@ static int ast_el_write_history(char *filename) static int ast_el_read_history(char *filename) { - char buf[256]; + char buf[MAX_HISTORY_COMMAND_LENGTH]; FILE *f; int ret = -1; @@ -2405,7 +2407,8 @@ static int ast_el_read_history(char *filename) return ret; while (!feof(f)) { - fgets(buf, sizeof(buf), f); + if (!fgets(buf, sizeof(buf), f)) + break; if (!strcmp(buf, "_HiStOrY_V2_\n")) continue; if (ast_all_zeros(buf)) |