summaryrefslogtreecommitdiffstats
path: root/freebsd
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2020-11-04 17:46:24 +0100
committerBenBE <BenBE@geshi.org>2020-11-15 18:25:21 +0100
commit397b5c4bd09115d0df0846fee1b06797b68ae11c (patch)
treec0680d6e463d6325f87e67ef12d88dc2bd805812 /freebsd
parentd785b1bbc3e30e41bacd283712455090eb2fe99c (diff)
Introduce spaceship comparison for Processes
If currently two unsigned values are compared via `a - b`, in the case b is actually bigger than a, the result will not be an negative number (as -1 is expected) but a huge positive number as the subtraction is an unsigned subtraction. Avoid over-/underflow affected operations; use comparisons. Modern compilers will generate sane code, like: xor eax, eax cmp rdi, rsi seta al sbb eax, 0 ret
Diffstat (limited to 'freebsd')
-rw-r--r--freebsd/FreeBSDProcess.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
index baad5d13..695594e8 100644
--- a/freebsd/FreeBSDProcess.c
+++ b/freebsd/FreeBSDProcess.c
@@ -111,6 +111,7 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc
static long FreeBSDProcess_compare(const void* v1, const void* v2) {
const FreeBSDProcess *p1, *p2;
const Settings *settings = ((const Process*)v1)->settings;
+
if (settings->direction == 1) {
p1 = (const FreeBSDProcess*)v1;
p2 = (const FreeBSDProcess*)v2;
@@ -118,14 +119,15 @@ static long FreeBSDProcess_compare(const void* v1, const void* v2) {
p2 = (const FreeBSDProcess*)v1;
p1 = (const FreeBSDProcess*)v2;
}
+
switch ((int) settings->sortKey) {
// add FreeBSD-specific fields here
case JID:
- return (p1->jid - p2->jid);
+ return SPACESHIP_NUMBER(p1->jid, p2->jid);
case JAIL:
- return strcmp(p1->jname ? p1->jname : "", p2->jname ? p2->jname : "");
+ return SPACESHIP_NULLSTR(p1->jname, p2->jname);
case TTY_NR:
- return strcmp(p1->ttyPath ? p1->ttyPath : "", p2->ttyPath ? p2->ttyPath : "");
+ return SPACESHIP_NULLSTR(p1->ttyPath, p2->ttyPath);
default:
return Process_compare(v1, v2);
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy