Squashed 'vendor/github.com/htop-dev/htop/' changes from 76989e4c75..a90081c195

a90081c195 Merge branch 'main' of github.com:htop-dev/htop
8620f7051f Merge branch 'skip-md-and-loop-block-devices'
6142cbbb17 Merge pull request #1802 from Explorer09/gpu-meter-text
71ff8604ab Skip loopback and MD (multi-device) driver entries in /proc/diskstats
ffc1093aea Cross-platform fixes to use units-based scaling in pcp-htop
74d7d52cf8 Type related fixes for a clean pcp-htop build on macOS
5b1c353492 Adjust GPUMeter text display
3df29214a3 Avoid double assignment in code style
8fb1d51699 Merge pull request #1799 from Explorer09/configure-compat
26a41987ef build: Fix Autoconf 2.69 compatibility regressions
c85222d438 Merge pull request #1754 from unrealapex/foot
1afb26b765 Merge pull request #1795 from Explorer09/configure-curses-header
3063ccc050 build: Simplify curses header checking code
d698e87b99 Merge pull request #1791 from Explorer09/configure-libunwind
d5228083b6 build: Also check libunwind through pkg-config
db199ce45c build: Use HTOP_PKG_CHECK_MODULES in hwloc and libnl checking
cf2479df93 build: Introduce HTOP_PKG_CHECK_MODULES wrapper macro
183db6c2fd build: Check unw_init_local() with custom test.
bf17a7e993 Merge pull request #1790 from Explorer09/ax-check-compile-flag
1fbbb2daf5 build: Update ax_check_compile_flag module
09ba4c19b9 Reapply "build: Improve '-Wextra-semi-stmt' warning option check"
c73f89464a Merge pull request #1779 from Explorer09/configure-libunwind
e136be5368 Merge pull request #1789 from n0099/main
63d02fa2ed Shadow path prefixes that used by NixOS
95a1ebe300 build: configure code indent tweaks
924aa4d279 build: Add configure check on whether local unwinding works
2a2709602e build: Rearrange libunwind.h detection code in configure
de6de258a6 build: Link with unw_init_local() when checking libunwind
18b46ead1b Merge pull request #1787 from Explorer09/configure-extra-semi-stmt
97073ba86e build: Improve '-Wextra-semi-stmt' warning option check
79785e88c6 Merge pull request #1598 from Explorer09/init-degree-sign
a52b43bbab Correct CRT_degreeSign buffer size & reduce code size
e896ab4ff1 docs: fix COLORS bullet list formatting and capitalization in man page
57b34bf5d7 Update CI to use OpenBSD 7.7 (i.e. fix builds)
ee1d1a840d Avoid pivotIndex overflow in (Vector) quickSort
31eaa551f1 Merge pull request #1786 from htop-dev/dependabot/github_actions/github/codeql-action-4
a5e5d088f9 Merge pull request #1782 from Explorer09/vector-dirty
f019ba9086 Bump github/codeql-action from 3 to 4
9367364d88 Rework Vector_softRemove() and compact() operations
44e3cddb18 Table_cleanupRow() logic tweak
ad475ec16c Hard-code Vector default size; avoid using -1 flag
818d01be44 Merge pull request #1721 from Explorer09/graph-dynamic-scale
496b3fb7fd NetworkIOMeter: remove code for auto-updating "total"
8b4b19552d TasksMeter: remove code for auto-updating "total"
5f9af8dd24 Adjust LoadAverageMeter "total" assignment
314a57ac34 Graph meter dynamic scaling and percent graph drawing
1dbae33d15 Update "total" value for non-percent bar meters
7a9ecebf22 Introduce isPercentChart member in MeterClass
5b2f4d5cef Merge branch 'BenBE-asprintf-fixes'
ecfc2517b6 Merge branch 'asprintf-fixes' of github.com:BenBE/htop into BenBE-asprintf-fixes
f4d04750d7 Merge branch 'Explorer09-xsnprintf-len'
7c6c9d3705 Merge branch 'xsnprintf-len' of github.com:Explorer09/htop-1 into Explorer09-xsnprintf-len
0e2eed0562 Merge branch 'natoscott-darwin-ci-fixes'
7e6e363f2b Merge branch 'darwin-ci-fixes' of github.com:natoscott/htop into natoscott-darwin-ci-fixes
0919bdd301 Transition several more byte length or offsets to size_t for macOS CI
7cb56cd317 Resolve implicit 64 to 32 bit int downgrade warning on nice level
21a0329d26 Explicitly cast to system types where needed (dev_t, uid_t, pid_t)
c148e4fd4b Clamp buffer length at INT_MAX in xSnprintf
635527a93e Ensure defined state of strp in xAsprintf
0d7f9d5f36 Reuse string buffer for second TTY driver path
823d23b0ed Ensure properly initialized memory passed into xAsprintf
4c99f0ec61 Add foot terminal to terminalSupportsDefinedKeys

git-subtree-dir: vendor/github.com/htop-dev/htop
git-subtree-split: a90081c19574eea7eacb7f29e9293d4cbde48aa4

Author: natoscott

.github/workflows/ci.yml

@@ -294,7 +294,7 @@ jobs:
         - name: Compile
           uses: vmactions/openbsd-vm@v1
           with:
-            release: '7.6'
+            release: '7.7'
             usesh: true
             prepare: |
               pkg_add gmake git

.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: cpp
 
@@ -46,4 +46,4 @@ jobs:
       run: make
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

AffinityPanel.c

@@ -96,7 +96,7 @@ static MaskItem* MaskItem_newMask(const char* text, const char* indent, hwloc_bi
    this->ownCpuset = owner;
    this->cpuset = cpuset;
    this->sub_tree = hwloc_bitmap_weight(cpuset) > 1 ? 1 : 0;
-   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+   this->children = Vector_new(Class(MaskItem), true, VECTOR_DEFAULT_SIZE);
    return this;
 }
 
@@ -107,7 +107,7 @@ static MaskItem* MaskItem_newSingleton(const char* text, int cpu, bool isSet) {
    this->text = xStrdup(text);
    this->indent = NULL; /* not a tree node */
    this->sub_tree = 0;
-   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+   this->children = Vector_new(Class(MaskItem), true, VECTOR_DEFAULT_SIZE);
 
    #ifdef HAVE_LIBHWLOC
    this->ownCpuset = true;
@@ -381,7 +381,7 @@ Panel* AffinityPanel_new(Machine* host, const Affinity* affinity, int* width) {
     * but this will be added by the caller */
    this->width = 14;
 
-   this->cpuids   = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+   this->cpuids   = Vector_new(Class(MaskItem), true, VECTOR_DEFAULT_SIZE);
 
    #ifdef HAVE_LIBHWLOC
    this->topoView = host->settings->topologyAffinity;

BatteryMeter.c

@@ -64,6 +64,7 @@ const MeterClass BatteryMeter_class = {
    .defaultMode = TEXT_METERMODE,
    .supportedModes = METERMODE_DEFAULT_SUPPORTED,
    .maxItems = 1,
+   .isPercentChart = true,
    .total = 100.0,
    .attributes = BatteryMeter_attributes,
    .name = "Battery",

CPUMeter.c

@@ -241,9 +241,10 @@ static void CPUMeterCommonInit(Meter* this) {
 
    CPUMeterData* data = this->meterData;
    if (!data) {
-      data = this->meterData = xMalloc(sizeof(CPUMeterData));
+      data = xCalloc(1, sizeof(CPUMeterData));
       data->cpus = this->host->existingCPUs;
       data->meters = count ? xCalloc(count, sizeof(Meter*)) : NULL;
+      this->meterData = data;
    }
 
    Meter** meters = data->meters;
@@ -352,6 +353,7 @@ const MeterClass CPUMeter_class = {
    .defaultMode = BAR_METERMODE,
    .supportedModes = METERMODE_DEFAULT_SUPPORTED,
    .maxItems = CPU_METER_ITEMCOUNT,
+   .isPercentChart = true,
    .total = 100.0,
    .attributes = CPUMeter_attributes,
    .name = "CPU",

CRT.c

@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include <errno.h>
 #include <fcntl.h>
 #include <langinfo.h>
+#include <limits.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -28,7 +29,7 @@ in the source distribution for its full text.
 #include <sys/mman.h>
 #endif
 
-#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LIBUNWIND)
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LOCAL_UNWIND)
 # define PRINT_BACKTRACE
 # define UNW_LOCAL_ONLY
 # include <libunwind.h>
@@ -94,21 +95,31 @@ const char* const* CRT_treeStr = CRT_treeStrAscii;
 
 static const Settings* CRT_settings;
 
-const char* CRT_degreeSign;
+#ifdef HAVE_LIBNCURSESW
+# if MB_LEN_MAX >= 3 // Minimum required to support UTF-8 BMP subset
+char CRT_degreeSign[MB_LEN_MAX * 2] = "\xc2\xb0";
+# else
+char CRT_degreeSign[MB_LEN_MAX * 2] = "";
+# endif
+#else
+char CRT_degreeSign[] = "";
+#endif
 
-static const char* initDegreeSign(void) {
+static void initDegreeSign(void) {
 #ifdef HAVE_LIBNCURSESW
+# if MB_LEN_MAX >= 3
    if (CRT_utf8)
-      return "\xc2\xb0";
+      return;
+# endif
 
-   static char buffer[4];
    // this might fail if the current locale does not support wide characters
-   int r = snprintf(buffer, sizeof(buffer), "%lc", 176);
-   if (r > 0)
-      return buffer;
+   int r = snprintf(CRT_degreeSign, sizeof(CRT_degreeSign), "%lc", 176);
+   if (r <= 0 || (size_t)r >= sizeof(CRT_degreeSign))
+      CRT_degreeSign[0] = '\0';
 #endif
 
-   return "";
+   // No-op
+   return;
 }
 
 const int* CRT_colors;
@@ -1131,6 +1142,11 @@ static bool terminalSupportsDefinedKeys(const char* termType) {
          return true;
       }
       break;
+   case 'f':
+      if (String_eq(termType, "foot")) {
+         return true;
+      }
+      break;
    case 's':
       if (termType[1] == 't' && IS_END_OR_DASH(termType[2])) {
          return true;
@@ -1265,7 +1281,7 @@ IGNORE_WCASTQUAL_END
 
    CRT_setMouse(settings->enableMouse);
 
-   CRT_degreeSign = initDegreeSign();
+   initDegreeSign();
 }
 
 void CRT_done(void) {
@@ -1335,7 +1351,7 @@ void CRT_setColors(int colorScheme) {
 
 #ifdef PRINT_BACKTRACE
 static void print_backtrace(void) {
-#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LIBUNWIND)
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LOCAL_UNWIND)
    unw_context_t context;
    unw_getcontext(&context);
 

CRT.h

@@ -182,7 +182,7 @@ void CRT_handleSIGSEGV(int signal) ATTR_NORETURN;
 #define KEY_FOCUS_OUT  (KEY_MAX + 'O')
 #define KEY_DEL_MAC    127
 
-extern const char* CRT_degreeSign;
+extern char CRT_degreeSign[];
 
 #ifdef HAVE_LIBNCURSESW
 

CommandLine.c

@@ -209,7 +209,7 @@ static CommandLineStatus parseArguments(int argc, char** argv, CommandLineSettin
                      fprintf(stderr, "Error: invalid user \"%s\".\n", username);
                      return STATUS_ERROR_EXIT;
                   }
-               flags->userId = atol(username);
+               flags->userId = (uid_t)atol(username);
             }
             break;
          }

DiskIOMeter.c

@@ -158,6 +158,7 @@ const MeterClass DiskIOMeter_class = {
    .defaultMode = TEXT_METERMODE,
    .supportedModes = METERMODE_DEFAULT_SUPPORTED,
    .maxItems = 1,
+   .isPercentChart = true,
    .total = 1.0,
    .attributes = DiskIOMeter_attributes,
    .name = "DiskIO",

FileDescriptorMeter.c

@@ -110,6 +110,7 @@ const MeterClass FileDescriptorMeter_class = {
    .defaultMode = TEXT_METERMODE,
    .supportedModes = METERMODE_DEFAULT_SUPPORTED,
    .maxItems = 2,
+   .isPercentChart = false,
    .total = 65536.0,
    .attributes = FileDescriptorMeter_attributes,
    .name = "FileDescriptors",