diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-14 10:10:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-14 10:10:40 +0000 |
| commit | bf3561fd15cff3fbfe6f67d134c23149ed35f493 (patch) | |
| tree | 470421827cff5e05f2f299f069ebc6e96f5d9a88 | |
| parent | f5294e1f4c56afb377ada95a7757b28ad3c89086 (diff) | |
| download | busybox-w32-bf3561fd15cff3fbfe6f67d134c23149ed35f493.tar.gz busybox-w32-bf3561fd15cff3fbfe6f67d134c23149ed35f493.tar.bz2 busybox-w32-bf3561fd15cff3fbfe6f67d134c23149ed35f493.zip | |
lineedit: do not try to open NULL history file
| -rw-r--r-- | libbb/lineedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index edc0e513c..59baf23a8 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
| @@ -953,7 +953,7 @@ static void remember_in_history(const char *str) | |||
| 953 | state->history[i++] = xstrdup(str); | 953 | state->history[i++] = xstrdup(str); |
| 954 | state->cur_history = i; | 954 | state->cur_history = i; |
| 955 | state->cnt_history = i; | 955 | state->cnt_history = i; |
| 956 | if (state->flags & SAVE_HISTORY) | 956 | if ((state->flags & SAVE_HISTORY) && state->hist_file) |
| 957 | save_history(state->hist_file); | 957 | save_history(state->hist_file); |
| 958 | USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) | 958 | USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) |
| 959 | } | 959 | } |
| @@ -1273,7 +1273,7 @@ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t | |||
| 1273 | /* With null flags, no other fields are ever used */ | 1273 | /* With null flags, no other fields are ever used */ |
| 1274 | state = st ? st : (line_input_t*) &const_int_0; | 1274 | state = st ? st : (line_input_t*) &const_int_0; |
| 1275 | #if ENABLE_FEATURE_EDITING_SAVEHISTORY | 1275 | #if ENABLE_FEATURE_EDITING_SAVEHISTORY |
| 1276 | if (state->flags & SAVE_HISTORY) | 1276 | if ((state->flags & SAVE_HISTORY) && state->hist_file) |
| 1277 | load_history(state->hist_file); | 1277 | load_history(state->hist_file); |
| 1278 | #endif | 1278 | #endif |
| 1279 | 1279 | ||