:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9wdAPThkLluaJ0FJ1CuHsxlM277dkND0nuy1KiU77k=; b=aUohVli5dlpe0lNoVcxoj+WYvPbjUnEkTxIUvz7DZKtLsI6ziGE1tQq7a2Chxly6+bbgxg ICdXraiP+PmA/CisnjotEjyKHe3Jr7OlFT5+jN4r14jP6zCDSClEyowjQ0i3I1jQjUOmeR P038+TL32RtuOY/OOQ8LkixXhuL9cCCx5PQSVUIRaI22LHwQxzLLK84SU9rBYpHUG/hIq8 QYcsEdVMVOWE8IBBF1bnpNXJfILyGzl/RvBp9Px4t32CCuIcbYyHSZWnLFexcB1MBAvEgS yfSFLg0IQA7lZSJNHXGf1ju5S0bGRtBWjclKI0404fpGDSVRTdxl4KUsSr3mTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777525926; a=rsa-sha256; cv=none; b=Mww2B1xCxOIi1pxPHun5bHYKdRt26G0CvdYO3XvxKR5XzUqB79DUNZtkwCDWffGwJzUShe Q9BVGOa9we8bl5imLLK8JlkNgAA3KJDe3rFF+OfmbdlNoEphBvDd9P8H7qUEmetDeezLGw y1sDnxG7bw+32Bmbe3zQUxYaOgzQi/E3JfzEkxKBUotXm+K0/6Uh205uj/qJHuXne2il3J /tVEU/lLJ8pQqktCwKrYsvjkuJonaCLkANoF+dPqgnQB77hkKv9EE0+TacJioKWEywba7B V6I9u9EGi+i6OGuIqynk2BXJU3DCzPbv3reuTnLBYIGjVOeNfQhiVqjyFe6t0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777525926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9wdAPThkLluaJ0FJ1CuHsxlM277dkND0nuy1KiU77k=; b=rBFgJTsvenITaeZxxVozOG0SCmCTySGd+Jjx99HfRgVsjuDteV1Rdalgd512rT1jDbhaCf dCH0mxh40NKaXzHkCDUxNeCLPD8HT2UyohmjhUihhGzKuhHye8nawiKYOd7NFzNHGCy0Jv NcWvElJECb7KUr0elYyUToxqqWII+dQ63OciwyTRpYj93ZB3Vf0nfnObFTfTVdm4SjkskU 2ZRULAoCDihVcfGAweufhypYlLPtTO1CPn2au46y68FkSxb1kO429QOknwxPCwparSxK3X ob8i9CUz7/yg3RFqXcakoQjEO99yNusT5AGoLQ+K7HBtOtfGLzqCy0M8tJVbPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5j2s6cdqz1C8l for ; Thu, 30 Apr 2026 05:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 05:12:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jamie Landeg-Jones From: Zhenlei Huang Subject: git: 6403ef5d2708 - stable/14 - /bin/ps: Fix display of negative nice values on ARMv7/aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6403ef5d2708e8889309c99e33bbd2f296e49990 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 05:12:00 +0000 Message-Id: <69f2e4a0.20c36.4e3ccfa3@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6403ef5d2708e8889309c99e33bbd2f296e49990 commit 6403ef5d2708e8889309c99e33bbd2f296e49990 Author: Jamie Landeg-Jones AuthorDate: 2026-03-07 01:18:20 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-30 05:10:38 +0000 /bin/ps: Fix display of negative nice values on ARMv7/aarch64 On Arm-based systems (and maybe others), 'char' defaults to unsigned, causing negative nice values to be displayed incorrectly (e.g., 246 instead of -10). Explicitly using 'signed char' ensures consistent behaviour across architectures. [ tested on RPI2 and generic aarch64 qemu install ] Before: # /usr/bin/nice --10 ps -l | awk '(NR == 1 || $(NF-1) == "ps")' UID PID PPID C PRI NI VSZ RSS MWCHAN STAT TT TIME COMMAND 0 23606 22800 2 -32 246 5400 2544 - R<+ 0 0:00.06 ps -l After: # /usr/bin/nice --10 ps -l | awk '(NR == 1 || $(NF-1) == "ps")' UID PID PPID C PRI NI VSZ RSS MWCHAN STAT TT TIME COMMAND 0 23614 22800 3 -32 -10 5400 2544 - R<+ 0 0:00.05 ps -l Signed-off-by: Jamie Landeg-Jones Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2064 (cherry picked from commit 9006a731bc951c5b62efc4bf75a0c5b42586d279) (cherry picked from commit e7eef56c6982f0f67789365b5e337e5cafb7fe91) --- bin/ps/keyword.c | 2 +- bin/ps/print.c | 3 +++ bin/ps/ps.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index b66beb376698..5f886497a272 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -139,7 +139,7 @@ static VAR keywords[] = { {"mwchan", {NULL}, "MWCHAN", "wait-channel", LJUST, mwchan, 0, UNSPEC, NULL}, {"ni", {"nice"}, NULL, NULL, 0, NULL, 0, UNSPEC, NULL}, - {"nice", {NULL}, "NI", "nice", 0, kvar, KOFF(ki_nice), CHAR, "d"}, + {"nice", {NULL}, "NI", "nice", 0, kvar, KOFF(ki_nice), SCHAR, "d"}, {"nivcsw", {NULL}, "NIVCSW", "involuntary-context-switches", USER, rvar, ROFF(ru_nivcsw), LONG, "ld"}, {"nlwp", {NULL}, "NLWP", "threads", 0, kvar, KOFF(ki_numthreads), diff --git a/bin/ps/print.c b/bin/ps/print.c index 5f5f7b23eaec..66d8c158e6ae 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -765,6 +765,9 @@ printval(void *bp, const VAR *v) case CHAR: (void)asprintf(&str, ofmt, *(char *)bp); break; + case SCHAR: + (void)asprintf(&str, ofmt, *(signed char *)bp); + break; case UCHAR: (void)asprintf(&str, ofmt, *(u_char *)bp); break; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index b82f8550ec3b..3cd74346f601 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -35,7 +35,7 @@ #define UNLIMITED 0 /* unlimited terminal width */ enum type { UNSPEC, /* For output routines that don't care and aliases. */ - CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; + CHAR, SCHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; typedef struct kinfo_str { STAILQ_ENTRY(kinfo_str) ks_next;