diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2021-03-21 19:40:56 +0100 |
|---|---|---|
| committer | cgzones <cgzones@googlemail.com> | 2021-04-14 17:29:56 +0200 |
| commit | 9a8221568ada269d20c3e9d291ad5f9d07cac755 (patch) | |
| tree | 025f098f3e98e3ae27105feb60dc76d4ff627452 /linux/LinuxProcessList.c | |
| parent | 36880cd61c52f13c6fd284aa23d42d9493d3ab2e (diff) | |
Rework TTY column
* Rename internal identifier from TTY_NR to just TTY
* Unify column header on platforms
* Use devname(3) on BSD derivate to show the actual terminal,
simplifies current FreeBSD implementation.
* Use 'unsigned long int' as id type, to fit dev_t on Linux.
Only on Solaris the terminal path is not yet resolved.
Diffstat (limited to 'linux/LinuxProcessList.c')
| -rw-r--r-- | linux/LinuxProcessList.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index e51c33ea..4564f8e6 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -1196,7 +1196,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc return true; } -static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned int tty_nr) { +static char* LinuxProcessList_updateTtyDevice(TtyDriver* ttyDrivers, unsigned long int tty_nr) { unsigned int maj = major(tty_nr); unsigned int min = minor(tty_nr); @@ -1363,13 +1363,13 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, openat_arg_ char command[MAX_NAME + 1]; unsigned long long int lasttimes = (lp->utime + lp->stime); - unsigned int tty_nr = proc->tty_nr; + unsigned long int tty_nr = proc->tty_nr; if (! LinuxProcessList_readStatFile(proc, procFd, command, sizeof(command))) goto errorReadingProcess; if (tty_nr != proc->tty_nr && this->ttyDrivers) { - free(lp->ttyDevice); - lp->ttyDevice = LinuxProcessList_updateTtyDevice(this->ttyDrivers, proc->tty_nr); + free(proc->tty_name); + proc->tty_name = LinuxProcessList_updateTtyDevice(this->ttyDrivers, proc->tty_nr); } if (settings->flags & PROCESS_FLAG_LINUX_IOPRIO) { |