svn commit: r335836 - head/usr.bin/top

[Conrad Meyer]

Hi Daichi,

On Sat, Jun 30, 2018 at 10:32 PM, Daichi GOTO <daichi at freebsd.org> wrote:
> Author: daichi
> Date: Sun Jul  1 05:32:03 2018
> New Revision: 335836
> URL: https://svnweb.freebsd.org/changeset/base/335836
>
> Log:
>   top(1) - support UTF-8 display
>
> ...
> ==============================================================================
> --- head/usr.bin/top/display.c  Sun Jul  1 01:56:40 2018        (r335835)
> +++ head/usr.bin/top/display.c  Sun Jul  1 05:32:03 2018        (r335836)
> @@ -1258,19 +1258,43 @@ line_update(char *old, char *new, int start, int line)
>  char *
>  printable(char str[])
>  {
> -    char *ptr;
> -    char ch;
> +       char *ptr;
> +       char ch;
>
> -    ptr = str;
> -    while ((ch = *ptr) != '\0')
> -    {
> -       if (!isprint(ch))
> -       {
> -           *ptr = '?';
> +       ptr = str;
> +       if (utf8flag) {
> +               while ((ch = *ptr) != '\0') {
> +                       if (0x00 == (0x80 & ch)) {
> +                               if (!isprint(ch)) {
> +                                       *ptr = '?';
> +                               }
> +                               ++ptr;
> +                       } else if (0xC0 == (0xE0 & ch)) {
> +                               ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                       } else if (0xE0 == (0xF0 & ch)) {
> +                               ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                       } else if (0xF0 == (0xF8 & ch)) {
> +                               ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                               if ('\0' != *ptr) ++ptr;
> +                       } else {
> +                               *ptr = '?';
> +                               ++ptr;
> +                       }
> +               }
> +       } else {
> +               while ((ch = *ptr) != '\0') {
> +                       if (!isprint(ch)) {
> +                               *ptr = '?';
> +                       }
> +                       ptr++;
> +               }
>         }


I don't think code to decode UTF-8 belongs in top(1).  I don't know
what the goal of this routine is, but I doubt this is the right way to
accomplish it.

For the strvisx portion it seems like support should be rolled into
libc instead.

(Also, the patch in phabricator does not seem to match what was committed.)

Best,
Conrad