changes for htop 0.8.2

This commit is contained in:
Hisham Muhammad
2009-06-02 04:51:23 +00:00
parent 1371ee28a7
commit 6330ff3a0a
25 changed files with 177 additions and 106 deletions

View File

@ -208,8 +208,8 @@ static int Process_getuid = -1;
static void Process_printLargeNumber(Process* this, RichString *str, unsigned long number) {
char buffer[11];
int len;
if(number >= (1000 * ONE_M)) {
len = snprintf(buffer, 10, "%4.2fG ", (float)number / ONE_M);
if(number >= (10 * ONE_M)) {
len = snprintf(buffer, 10, "%3.1fG ", (float)number / ONE_M);
RichString_appendn(str, CRT_colors[LARGE_NUMBER], buffer, len);
} else if(number >= (100000)) {
len = snprintf(buffer, 10, "%4ldM ", number / ONE_K);
@ -535,7 +535,7 @@ int Process_compare(const void* v1, const void* v2) {
case PPID:
return (p1->ppid - p2->ppid);
case USER:
return strcmp(p1->user, p2->user);
return strcmp(p1->user ? p1->user : "", p2->user ? p2->user : "");
case PRIORITY:
return (p1->priority - p2->priority);
case PROCESSOR: