Merge branch 'htop-dev:main' into main

Author: long-crypto

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>
@@ -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;
@@ -1265,7 +1276,7 @@ IGNORE_WCASTQUAL_END
 
    CRT_setMouse(settings->enableMouse);
 
-   CRT_degreeSign = initDegreeSign();
+   initDegreeSign();
 }
 
 void CRT_done(void) {

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
 

Process.c

@@ -295,6 +295,12 @@ void Process_makeCommandStr(Process* this, const Settings* settings) {
                   }                                                                           \
                }                                                                              \
                break;                                                                         \
+            case 'n':                                                                         \
+               CHECK_AND_MARK(str_, "/nix/store/");                                           \
+               break;                                                                         \
+            case 'r':                                                                         \
+               CHECK_AND_MARK(str_, "/run/current-system/");                                  \
+               break;                                                                         \
          }                                                                                    \
       } while (0)
 

configure.ac

@@ -1217,7 +1217,11 @@ AS_VAR_IF(CACHEVAR,yes,
 AS_VAR_POPDEF([CACHEVAR])dnl
 ])dnl AX_CHECK_COMPILE_FLAGS
 
-AX_CHECK_COMPILE_FLAG([-Wextra-semi-stmt],         [AM_CFLAGS="$AM_CFLAGS -Wextra-semi-stmt"],         , [-Werror=unknown-warning-option]) dnl the autoconf check itself generates -Wextra-semi-stmt
+dnl During the check of '-Wextra-semi-stmt' we must treat
+dnl 'extra-semi-stmt' as a non-error because the AC_LANG_PROGRAM
+dnl template will generate a warning of this (by design).
+AX_CHECK_COMPILE_FLAG([-Wextra-semi-stmt],         [AM_CFLAGS="$AM_CFLAGS -Wextra-semi-stmt"],         , [-Werror -Wno-error=extra-semi-stmt])
+
 AX_CHECK_COMPILE_FLAG([-Wimplicit-int-conversion], [AM_CFLAGS="$AM_CFLAGS -Wimplicit-int-conversion"], , [-Werror])
 AX_CHECK_COMPILE_FLAG([-Wnull-dereference],        [AM_CFLAGS="$AM_CFLAGS -Wnull-dereference"],        , [-Werror])