emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bc: do not allocate line editing state until needed

Browse Source 
function                                             old     new   delta
xc_read_line                                         324     353     +29
free_line_input_t                                     34      39      +5
xc_vm_init                                           656     640     -16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 34/-16)             Total: 18 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-21 21:36:58 +01:00
parent e4202df091
commit 00eb23b47a
5 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libbb.h
View File

@ -1906,7 +1906,11 @@ enum {
FOR_SHELL = DO_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION,
};
line_input_t *new_line_input_t(int flags) FAST_FUNC;
#if ENABLE_FEATURE_EDITING_SAVEHISTORY
void free_line_input_t(line_input_t *n) FAST_FUNC;
#else
# define free_line_input_t(n) free(n)
#endif
/*
* maxsize must be >= 2.
* Returns:

10
libbb/lineedit.c
View File

@ -1417,15 +1417,19 @@ void FAST_FUNC show_history(const line_input_t *st)
printf("%4d %s\n", i, st->history[i]);
}
# if ENABLE_FEATURE_EDITING_SAVEHISTORY
void FAST_FUNC free_line_input_t(line_input_t *n)
{
# if ENABLE_FEATURE_EDITING_SAVEHISTORY
if (n) {
int i = n->cnt_history;
while (i > 0)
free(n->history[--i]);
#endif
free(n);
}
}
# else
/* #defined to free() in libbb.h */
# endif
# if ENABLE_FEATURE_EDITING_SAVEHISTORY
/* We try to ensure that concurrent additions to the history
@ -1506,7 +1510,7 @@ void save_history(line_input_t *st)
{
FILE *fp;
if (!st->hist_file)
if (!st || !st->hist_file)
return;
if (st->cnt_history <= st->cnt_history_in_file)
return;

37
miscutils/bc.c
View File

@ -2545,6 +2545,8 @@ static void xc_read_line(BcVec *vec, FILE *fp)
# if ENABLE_FEATURE_EDITING
if (G_ttyin && fp == stdin) {
int n, i;
if (!G.line_input_state)
G.line_input_state = new_line_input_t(DO_HISTORY);
# define line_buf bb_common_bufsiz1
n = read_line_input(G.line_input_state, "", line_buf, COMMON_BUFSIZE);
if (n <= 0) { // read errors or EOF, or ^D, or ^C
@ -6872,22 +6874,6 @@ static BC_STATUS zxc_program_exec(void)
}
#define zxc_program_exec(...) (zxc_program_exec(__VA_ARGS__) COMMA_SUCCESS)
static unsigned xc_vm_envLen(const char *var)
{
char *lenv;
unsigned len;
lenv = getenv(var);
len = BC_NUM_PRINT_WIDTH;
if (!lenv) return len;
len = bb_strtou(lenv, NULL, 10) - 1;
if (errno || len < 2 || len >= INT_MAX)
len = BC_NUM_PRINT_WIDTH;
return len;
}
static BC_STATUS zxc_vm_process(const char *text)
{
BcStatus s;
@ -7377,12 +7363,25 @@ static void xc_program_init(void)
bc_char_vec_init(&G.input_buffer);
}
static unsigned xc_vm_envLen(const char *var)
{
char *lenv;
unsigned len;
lenv = getenv(var);
len = BC_NUM_PRINT_WIDTH;
if (!lenv) return len;
len = bb_strtou(lenv, NULL, 10) - 1;
if (errno || len < 2 || len >= INT_MAX)
len = BC_NUM_PRINT_WIDTH;
return len;
}
static int xc_vm_init(const char *env_len)
{
G.prog.len = xc_vm_envLen(env_len);
#if ENABLE_FEATURE_EDITING
G.line_input_state = new_line_input_t(DO_HISTORY);
#endif
bc_vec_init(&G.files, sizeof(char *), NULL);
xc_program_init();

3
shell/ash.c
View File

@ -14177,8 +14177,7 @@ exitshell(void)
char *p;
#if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
if (line_input_state)
save_history(line_input_state);
save_history(line_input_state); /* may be NULL */
#endif
savestatus = exitstatus;
TRACE(("pid %d, exitshell(%d)\n", getpid(), savestatus));

3
shell/hush.c
View File

@ -2056,8 +2056,7 @@ static sighandler_t pick_sighandler(unsigned sig)
static void hush_exit(int exitcode)
{
#if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
if (G.line_input_state)
save_history(G.line_input_state);
save_history(G.line_input_state); /* may be NULL */
#endif
fflush_all();