X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/d47d78255ef8ede773c69a97e2cb5de78cee7da9..46c4540dd2f6181e77b0800a4e007d78d0162487:/components/netspeeds.c?ds=sidebyside

diff --git a/components/netspeeds.c b/components/netspeeds.c
index b4e6972..f0f7455 100644
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -17,14 +17,20 @@
 
 		oldrxbytes = rxbytes;
 
-		snprintf(path, sizeof(path),
-		         "/sys/class/net/%s/statistics/rx_bytes", interface);
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/rx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%llu", &rxbytes) != 1) {
 			return NULL;
 		}
+		if (oldrxbytes == 0) {
+			return NULL;
+		}
 
-		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-		                               interval * 1000) : NULL;
+		return fmt_human_2((rxbytes - oldrxbytes) *
+		                   1000 / interval, "B/s");
 	}
 
 	const char *
@@ -37,14 +43,20 @@
 
 		oldtxbytes = txbytes;
 
-		snprintf(path, sizeof(path),
-		         "/sys/class/net/%s/statistics/tx_bytes", interface);
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/tx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%llu", &txbytes) != 1) {
 			return NULL;
 		}
+		if (oldtxbytes == 0) {
+			return NULL;
+		}
 
-		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-		                               interval * 1000) : NULL;
+		return fmt_human_2((txbytes - oldtxbytes) *
+		                   1000 / interval, "B/s");
 	}
 #elif defined(__OpenBSD__)
 	#include <string.h>
@@ -81,9 +93,12 @@
 			warn("reading 'if_data' failed");
 			return NULL;
 		}
+		if (oldrxbytes == 0) {
+			return NULL;
+		}
 
-		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-		                               interval * 1000) : NULL;
+		return fmt_human_2((rxbytes - oldrxbytes) *
+		                   1000 / interval, "B/s");
 	}
 
 	const char *
@@ -114,8 +129,11 @@
 			warn("reading 'if_data' failed");
 			return NULL;
 		}
+		if (oldtxbytes == 0) {
+			return NULL;
+		}
 
-		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-		                               interval * 1000) : NULL;
+		return fmt_human_2((txbytes - oldtxbytes) *
+		                   1000 / interval, "B/s");
 	}
 #endif