Trim interface length if its too big for window

kala13x · Nov 26, 2024 · d4d61a9 · d4d61a9
1 parent 0286574
commit d4d61a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/sys/xtop.c b/src/sys/xtop.c
@@ -138,14 +138,6 @@ int XTop_GetNetworkStats(xtop_stats_t *pStats, xarray_t *pIfaces)
         if (pDstIface == NULL) continue;
 
         memcpy(pDstIface, pSrcIface, sizeof(xnet_iface_t));
-        if (strnlen(pDstIface->sName, sizeof(pDstIface->sName) - 1) > 12)
-        {
-            pDstIface->sName[9] = '.';
-            pDstIface->sName[10] = '.';
-            pDstIface->sName[11] = '.';
-            pDstIface->sName[12] = XSTR_NUL;
-        }
-
         if (XArray_AddData(pIfaces, pDstIface, 0) < 0) free(pDstIface); 
     }
 

diff --git a/src/xver.h b/src/xver.h
@@ -12,7 +12,7 @@
 
 #define XUTILS_VERSION_MAX     2
 #define XUTILS_VERSION_MIN     6
-#define XUTILS_BUILD_NUMBER    12
+#define XUTILS_BUILD_NUMBER    13
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/tools/xtop.c b/tools/xtop.c
@@ -21,7 +21,7 @@
 #include "api.h"
 
 #define XTOP_VERSION_MAJ        1
-#define XTOP_VERSION_MIN        4
+#define XTOP_VERSION_MIN        5
 
 #define XTOP_SORT_DISABLE       0
 #define XTOP_SORT_BUSY          1
@@ -760,8 +760,18 @@ XSTATUS XTOPApp_AddNetworkInfo(xcli_win_t *pWin, xtop_args_t *pArgs, xarray_t *p
         if (xstrused(pIface->sName) == XTRUE && nTrackLen > 0 && nTrackID < 0 &&
             !strncmp(pArgs->sName, pIface->sName, nTrackLen)) nTrackID = (int)i;
 
-        size_t nNextLength = strlen(pIface->sName);
-        if (nNextLength > nLength) nLength = nNextLength;
+        size_t nNextLength = strnlen(pIface->sName, sizeof(pIface->sName));
+        if (nNextLength > 12)
+        {
+            nNextLength = 12;
+            pIface->sName[9] = '.';
+            pIface->sName[10] = '.';
+            pIface->sName[11] = '.';
+            pIface->sName[12] = XSTR_NUL;
+        }
+
+        if (nNextLength > nLength)
+            nLength = nNextLength;
     }
 
     /* If iface length is less than "total", take "total" length as maximum */