emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: correct an insidious occasional truncation buglet

Browse Source 
With the help of our Swedish translator, hopefully the
final buglet has now been vanquished in the multi-byte
translation support. This one was a real nasty bugger.

Although it didn't occur with every terminal emulator,
occasionally random text lines were being chopped off.

As it turns out, those terminals were blameless. There
were two separate places in top's show_special routine
where potential multi-byte sequences were inadequately
addressed. Solution: exploit existing utf-8 functions.

[ it also became apparent that the translation hints ]
[ in the top_nls module were deficient. so a special ]
[ caution was added regarding the final line of txt. ]

Reference(s):
https://gitlab.com/procps-ng/procps/issues/68

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-10-02 00:00:00 -05:00 committed by Craig Small
parent e189569db2
commit 1bc25e920a
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
top/top.c
View File

@ -771,7 +771,7 @@ static void show_special (int interact, const char *glob) {
case 5: case 6: case 7: case 8:
*sub_end = '\0';
snprintf(tmp, sizeof(tmp), "%s%.*s%s"
, Curwin->captab[ch], room, sub_beg, Caps_off);
, Curwin->captab[ch], utf8_embody(sub_beg, room), sub_beg, Caps_off);
rp = scat(rp, tmp);
room -= (sub_end - sub_beg);
room += utf8_delta(sub_beg);
@ -794,7 +794,7 @@ static void show_special (int interact, const char *glob) {
it probably means caller wants to retain cursor position on this final
line. That, in turn, means we're interactive and so we'll just do our
'fit-to-screen' thingy while also leaving room for the cursor... */
if (*glob) PUTT("%.*s", Screen_cols -1, glob);
if (*glob) PUTT("%.*s", utf8_embody(glob, Screen_cols - 1), glob);
} // end: show_special

3
top/top.h
View File

@ -69,6 +69,9 @@
/* For the impetus and NUMA/Node prototype design, thanks to:
Lance Shelton <LShelton@fusionio.com> - April, 2013 */
/* For prompting & helping with top's utf-8 support, thanks to:
Göran Uddeborg <goeran@uddeborg.se> - September, 2017 */
// pretend as if #define _GNU_SOURCE
char *strcasestr(const char *haystack, const char *needle);

11
top/top_nls.c
View File

@ -520,6 +520,17 @@ static void build_uniq_nlstab (void) {
. If you would like additional information regarding these strings,
. please see the prologue to the show_special function in the top.c
. source file.
.
. Caution:
. The next three items represent pages for interacting with a user.
. In all cases, the last lines of text must be treated with care.
.
. They must not end with a newline character so that at runtime the
. cursor will remain on that final text line.
.
. Also, the special sequences (tilde+number) must not appear on the
. last line (the one without the newline). So please avoid any line
. wraps that could place them there.
. */
Uniq_nlstab[KEYS_helpbas_fmt] = _(""