New upstream version 3.1.1upstream/3.1.1

18 files changed, 29 insertions, 25 deletions

diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c
index 8c637fd..1efde2f 100644
--- a/linux/HugePageMeter.c
+++ b/linux/HugePageMeter.c
@@ -1,7 +1,7 @@
 /*
 htop - HugePageMeter.c
 (C) 2021 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/HugePageMeter.h b/linux/HugePageMeter.h
index e3b867d..d74a19e 100644
--- a/linux/HugePageMeter.h
+++ b/linux/HugePageMeter.h
@@ -3,7 +3,7 @@
 /*
 htop - HugePageMeter.h
 (C) 2021 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/IOPriority.h b/linux/IOPriority.h
index 2b37cb0..78bc470 100644
--- a/linux/IOPriority.h
+++ b/linux/IOPriority.h
@@ -3,7 +3,7 @@
 /*
 htop - IOPriority.h
 (C) 2004-2012 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 
 Based on ionice,
diff --git a/linux/IOPriorityPanel.c b/linux/IOPriorityPanel.c
index 1bcbf4b..3e91bc4 100644
--- a/linux/IOPriorityPanel.c
+++ b/linux/IOPriorityPanel.c
@@ -1,7 +1,7 @@
 /*
 htop - IOPriorityPanel.c
 (C) 2004-2012 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/IOPriorityPanel.h b/linux/IOPriorityPanel.h
index 3aa7610..cb5b338 100644
--- a/linux/IOPriorityPanel.h
+++ b/linux/IOPriorityPanel.h
@@ -3,7 +3,7 @@
 /*
 htop - IOPriorityPanel.h
 (C) 2004-2012 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 75638e4..49ae541 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -2,7 +2,7 @@
 htop - LinuxProcess.c
 (C) 2014 Hisham H. Muhammad
 (C) 2020 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
index 20399d9..577b903 100644
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@@ -4,7 +4,7 @@
 htop - LinuxProcess.h
 (C) 2014 Hisham H. Muhammad
 (C) 2020 Red Hat, Inc.  All Rights Reserved.
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 8d82b00..dbbc57d 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -1,7 +1,7 @@
 /*
 htop - LinuxProcessList.c
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -58,6 +58,10 @@ in the source distribution for its full text.
 #include "LibSensors.h"
 #endif
 
+#ifndef O_PATH
+#define O_PATH         010000000 // declare for ancient glibc versions
+#endif
+
 
 static long long btime = -1;
 
@@ -1236,8 +1240,8 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc
    if (amtRead > 0) {
       filename[amtRead] = 0;
       if (!process->procExe ||
-         (!process->procExeDeleted && !String_eq(filename, process->procExe)) ||
-         (process->procExeDeleted && !String_startsWith(filename, process->procExe))) {
+          (!process->procExeDeleted && !String_eq(filename, process->procExe)) ||
+          process->procExeDeleted) {
 
          const char* deletedMarker = " (deleted)";
          const size_t markerLen = strlen(deletedMarker);
@@ -1605,7 +1609,7 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) {
                (variable) = parsed_;                                         \
             }                                                                \
             break;                                                           \
-         }
+         } else (void) 0 /* Require a ";" after the macro use. */
 
       switch (buffer[0]) {
       case 'M':
@@ -1781,12 +1785,12 @@ static inline void LinuxProcessList_scanZfsArcstats(LinuxProcessList* lpl) {
          if (String_startsWith(buffer, label)) {                               \
             sscanf(buffer + strlen(label), " %*2u %32llu", variable);          \
             break;                                                             \
-         }
+         } else (void) 0 /* Require a ";" after the macro use. */
       #define tryReadFlag(label, variable, flag)                               \
          if (String_startsWith(buffer, label)) {                               \
             (flag) = sscanf(buffer + strlen(label), " %*2u %32llu", variable); \
             break;                                                             \
-         }
+         } else (void) 0 /* Require a ";" after the macro use. */
 
       switch (buffer[0]) {
       case 'c':
diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h
index a5640e2..6c2f7db 100644
--- a/linux/LinuxProcessList.h
+++ b/linux/LinuxProcessList.h
@@ -3,7 +3,7 @@
 /*
 htop - LinuxProcessList.h
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/Platform.c b/linux/Platform.c
index 05023d5..e305e7f 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -1,7 +1,7 @@
 /*
 htop - linux/Platform.c
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -331,8 +331,8 @@ void Platform_setMemoryValues(Meter* this) {
    const ProcessList* pl = this->pl;
    const LinuxProcessList* lpl = (const LinuxProcessList*) pl;
 
-   this->total     = pl->totalMem > lpl->totalHugePageMem ? pl->totalMem - lpl->totalHugePageMem : pl->totalMem;
-   this->values[0] = pl->usedMem > lpl->totalHugePageMem ? pl->usedMem - lpl->totalHugePageMem : pl->usedMem;
+   this->total     = pl->totalMem;
+   this->values[0] = pl->usedMem;
    this->values[1] = pl->buffersMem;
    this->values[2] = pl->sharedMem;
    this->values[3] = pl->cachedMem;
diff --git a/linux/Platform.h b/linux/Platform.h
index 0d6d4a9..9c4e65d 100644
--- a/linux/Platform.h
+++ b/linux/Platform.h
@@ -3,7 +3,7 @@
 /*
 htop - linux/Platform.h
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c
index ff34f9b..e5089fc 100644
--- a/linux/PressureStallMeter.c
+++ b/linux/PressureStallMeter.c
@@ -2,7 +2,7 @@
 htop - PressureStallMeter.c
 (C) 2004-2011 Hisham H. Muhammad
 (C) 2019 Ran Benita
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/PressureStallMeter.h b/linux/PressureStallMeter.h
index 7317b35..8acf46b 100644
--- a/linux/PressureStallMeter.h
+++ b/linux/PressureStallMeter.h
@@ -6,7 +6,7 @@
 htop - PressureStallMeter.h
 (C) 2004-2011 Hisham H. Muhammad
 (C) 2019 Ran Benita
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/ProcessField.h b/linux/ProcessField.h
index 69bdff0..7047592 100644
--- a/linux/ProcessField.h
+++ b/linux/ProcessField.h
@@ -3,7 +3,7 @@
 /*
 htop - linux/ProcessField.h
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c
index e3b076d..c35cb68 100644
--- a/linux/SELinuxMeter.c
+++ b/linux/SELinuxMeter.c
@@ -1,7 +1,7 @@
 /*
 htop - SELinuxMeter.c
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/SELinuxMeter.h b/linux/SELinuxMeter.h
index 453940c..d8a04db 100644
--- a/linux/SELinuxMeter.h
+++ b/linux/SELinuxMeter.h
@@ -3,7 +3,7 @@
 /*
 htop - SELinuxMeter.h
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c
index 245bb7b..567cfc7 100644
--- a/linux/SystemdMeter.c
+++ b/linux/SystemdMeter.c
@@ -1,7 +1,7 @@
 /*
 htop - SystemdMeter.c
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/linux/SystemdMeter.h b/linux/SystemdMeter.h
index 98ce6f7..a05e087 100644
--- a/linux/SystemdMeter.h
+++ b/linux/SystemdMeter.h
@@ -4,7 +4,7 @@
 /*
 htop - SystemdMeter.h
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */