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

Use PROCDIR throughout instead of /proc on Linux

This commit is contained in:
Christian Göttsche 2020-09-15 12:29:46 +02:00 committed by cgzones
parent 1efddaf1e5
commit 37921382f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/LinuxProcessList.c
View File

@ -477,7 +477,7 @@ static bool LinuxProcessList_readSmapsFile(LinuxProcess* process, const char* di
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* dirname, const char* name) { static void LinuxProcessList_readOpenVZData(LinuxProcess* process, const char* dirname, const char* name) {
if ( (access("/proc/vz", R_OK) != 0)) { if ( (access(PROCDIR "/vz", R_OK) != 0)) {
process->vpid = process->super.pid; process->vpid = process->super.pid;
process->ctid = 0; process->ctid = 0;
return; return;

4
linux/Platform.c
View File

@ -230,8 +230,8 @@ void Platform_setZfsCompressedArcValues(Meter* this) {
ZfsCompressedArcMeter_readStats(this, &(lpl->zfs)); ZfsCompressedArcMeter_readStats(this, &(lpl->zfs));
} }
char* Platform_getProcessEnv(pid_t pid) { char* Platform_getProcessEnv(pid_t pid) {
char procname[32+1]; char procname[128];
xSnprintf(procname, 32, "/proc/%d/environ", pid); xSnprintf(procname, sizeof(procname), PROCDIR "/%d/environ", pid);
FILE* fd = fopen(procname, "r"); FILE* fd = fopen(procname, "r");
char *env = NULL; char *env = NULL;
if (fd) { if (fd) {