From: Jim Warner <james.warner@comcast.net>
Date: Fri, 6 Oct 2017 05:00:00 +0000 (-0500)
Subject: top: make 'utf8_justify' independent of non-utf8 logic
X-Git-Tag: v4.0.0~682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d734d18f62dddba89b0d69fee2da69fd51f159b2;p=procps-ng

top: make 'utf8_justify' independent of non-utf8 logic

By eliminating the call to 'fmtmk', the 'utf8_justify'
function could more easily be used in libproc someday.

Signed-off-by: Jim Warner <james.warner@comcast.net>
---

diff --git a/top/top.c b/top/top.c
index 1830803d..178db183 100644
--- a/top/top.c
+++ b/top/top.c
@@ -545,11 +545,11 @@ static int utf8_embody (const char *str, int width) {
 static const char *utf8_justify (const char *str, int width, int justr) {
    static char l_fmt[]  = "%-*.*s%s", r_fmt[] = "%*.*s%s";
    static char buf[SCREENMAX];
-   const char *p;
+   char tmp[SCREENMAX];
 
-   p = fmtmk("%.*s", utf8_embody(str, width), str);
-   width += utf8_delta(p);
-   snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, p, COLPADSTR);
+   snprintf(tmp, sizeof(tmp), "%.*s", utf8_embody(str, width), str);
+   width += utf8_delta(tmp);
+   snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, tmp, COLPADSTR);
    return buf;
 } // end: utf8_justify