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

editline: fix behavior when tty is narrower than column width

Browse Source 
Fixes crash when dividing by the number of columns,
which was computed as zero in this situation.

Instead, always have at least one "column" even if it wraps.
This commit is contained in:
Will Dietz 2019-04-26 12:12:26 -05:00
parent 6a4d77ca69
commit 8660aef4b7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/editline.c
View File

@ -284,13 +284,16 @@ void el_print_columns(int ac, char **av)
int skip;
int longest;
int cols;
int colwidth;
/* Find longest name, determine column count from that. */
for (longest = 0, i = 0; i < ac; i++) {
if ((j = strlen((char *)av[i])) > longest)
longest = j;
}
cols = tty_cols / (longest + 3);
colwidth = longest + 3;
if (colwidth > tty_cols) colwidth = tty_cols;
cols = tty_cols / colwidth;
tty_puts(NEWLINE);
for (skip = ac / cols + 1, i = 0; i < skip; i++) {
@ -299,7 +302,7 @@ void el_print_columns(int ac, char **av)
tty_put(*p);
if (j + skip < ac) {
while (++len < longest + 3)
while (++len < colwidth)
tty_put(' ');
}
}