Use the sioctl_open(3) OpenBSD API to access vol

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index bdaf420..0029177 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -10,43 +10,55 @@
        const char *
        netspeed_rx(const char *interface)
        {
-               uint64_t oldrxbytes;
-               static uint64_t rxbytes = 0;
+               uintmax_t oldrxbytes;
+               static uintmax_t rxbytes;
                extern const unsigned int interval;
                char path[PATH_MAX];
 
                oldrxbytes = rxbytes;
 
-               snprintf(path, sizeof(path),
-                        "/sys/class/net/%s/statistics/rx_bytes", interface);
-               if (pscanf(path, "%llu", &rxbytes) != 1) {
+               if (esnprintf(path, sizeof(path),
+                             "/sys/class/net/%s/statistics/rx_bytes",
+                             interface) < 0) {
+                       return NULL;
+               }
+               if (pscanf(path, "%ju", &rxbytes) != 1) {
+                       return NULL;
+               }
+               if (oldrxbytes == 0) {
                        return NULL;
                }
 
-               return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);
        }
 
        const char *
        netspeed_tx(const char *interface)
        {
-               uint64_t oldtxbytes;
-               static uint64_t txbytes = 0;
+               uintmax_t oldtxbytes;
+               static uintmax_t txbytes;
                extern const unsigned int interval;
                char path[PATH_MAX];
 
                oldtxbytes = txbytes;
 
-               snprintf(path, sizeof(path),
-                        "/sys/class/net/%s/statistics/tx_bytes", interface);
-               if (pscanf(path, "%llu", &txbytes) != 1) {
+               if (esnprintf(path, sizeof(path),
+                             "/sys/class/net/%s/statistics/tx_bytes",
+                             interface) < 0) {
+                       return NULL;
+               }
+               if (pscanf(path, "%ju", &txbytes) != 1) {
+                       return NULL;
+               }
+               if (oldtxbytes == 0) {
                        return NULL;
                }
 
-               return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+                                1024);
        }
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) | defined(__FreeBSD__)
        #include <string.h>
        #include <ifaddrs.h>
        #include <sys/types.h>
@@ -58,10 +70,10 @@
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
-               uint64_t oldrxbytes;
-               static uint64_t rxbytes = 0;
+               uintmax_t oldrxbytes;
+               static uintmax_t rxbytes;
                extern const unsigned int interval;
-               char if_ok = 0;
+               int if_ok = 0;
 
                oldrxbytes = rxbytes;
 
@@ -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((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);
        }
 
        const char *
@@ -91,10 +106,10 @@
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
-               uint64_t oldtxbytes;
-               static uint64_t txbytes = 0;
+               uintmax_t oldtxbytes;
+               static uintmax_t txbytes;
                extern const unsigned int interval;
-               char if_ok = 0;
+               int if_ok = 0;
 
                oldtxbytes = txbytes;
 
@@ -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((txbytes - oldtxbytes) * 1000 / interval,
+                                1024);
        }
 #endif