zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use uid_t type for Process_getuid

This commit is contained in:
Christian Göttsche 2020-11-04 17:46:04 +01:00 committed by BenBE
parent 397b5c4bd0
commit 42073babb9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Process.c
View File

@ -35,7 +35,7 @@ in the source distribution for its full text.
#endif #endif
static int Process_getuid = -1; static uid_t Process_getuid = (uid_t)-1;
char Process_pidFormat[20] = "%7d "; char Process_pidFormat[20] = "%7d ";
@ -360,7 +360,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
case TPGID: xSnprintf(buffer, n, Process_pidFormat, this->tpgid); break; case TPGID: xSnprintf(buffer, n, Process_pidFormat, this->tpgid); break;
case TTY_NR: xSnprintf(buffer, n, "%3u:%3u ", major(this->tty_nr), minor(this->tty_nr)); break; case TTY_NR: xSnprintf(buffer, n, "%3u:%3u ", major(this->tty_nr), minor(this->tty_nr)); break;
case USER: { case USER: {
if (Process_getuid != (int) this->st_uid) if (Process_getuid != this->st_uid)
attr = CRT_colors[PROCESS_SHADOW]; attr = CRT_colors[PROCESS_SHADOW];
if (this->user) { if (this->user) {
xSnprintf(buffer, n, "%-9s ", this->user); xSnprintf(buffer, n, "%-9s ", this->user);
@ -386,7 +386,7 @@ void Process_display(const Object* cast, RichString* out) {
for (int i = 0; fields[i]; i++) for (int i = 0; fields[i]; i++)
As_Process(this)->writeField(this, out, fields[i]); As_Process(this)->writeField(this, out, fields[i]);
if (this->settings->shadowOtherUsers && (int)this->st_uid != Process_getuid) { if (this->settings->shadowOtherUsers && this->st_uid != Process_getuid) {
RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]); RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]);
} }
@ -420,7 +420,7 @@ void Process_init(Process* this, const struct Settings_* settings) {
this->updated = false; this->updated = false;
this->basenameOffset = -1; this->basenameOffset = -1;
if (Process_getuid == -1) { if (Process_getuid == (uid_t)-1) {
Process_getuid = getuid(); Process_getuid = getuid();
} }
} }