]> granicus.if.org Git - procps-ng/commitdiff
top: adjust some parenthesis for correct '^N' behavior <=== port of newlib 3c7f8199
authorJim Warner <james.warner@comcast.net>
Mon, 20 Jun 2022 05:00:00 +0000 (00:00 -0500)
committerCraig Small <csmall@dropbear.xyz>
Mon, 20 Jun 2022 11:43:44 +0000 (21:43 +1000)
______________________________ original newlib message

Some kdeinit tasks have a large environment consisting
mostly of nulls which were then followed by one or two
printable characters. Such strange environments should
not be shown with that 'not applicable' (n/a) notation
even though that first string vector is equal to '\0'.

I thought I had covered such a contingency but, due to
a misplaced right parenthesis, that '^N' bottom window
could see 'n/a' + a bunch of spaces + printable stuff.

Well, that won't happen anymore with this tiny change.

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

index 5f2d27e837f9c95aef31d820a31585abd29a5648..9e3574fc0d14cb793c80b13f298ffe48f9019b89 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -5245,7 +5245,7 @@ static int bot_focus_strv (const char *hdr, const char **strv) {
       n = (char *)&strv[0] - strv[0];
       if (n >= sizeof(Bot_buf)) n = sizeof(Bot_buf) - 1;
       memcpy(Bot_buf, strv[0], n);
-      if (!Bot_buf[0] || (!strcmp(Bot_buf, "-") && n <= sizeof(char *)))
+      if ((!Bot_buf[0] || !strcmp(Bot_buf, "-")) && n <= sizeof(char *))
          strcpy(Bot_buf, N_txt(X_BOT_nodata_txt));
       for (nsav= 0, p = Bot_buf, x = 0; strv[nsav] != NULL; nsav++) {
          p += strlen(strv[nsav]) + 1;