fix slurp(), it needs to read size-1 for the trailing NUL

[i3/i3status] / src / print_eth_info.c

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index d09873ed8aefbd619624601d1a42815b7a1c0259..45a44a4b9a8aaea6c38126dede1b26f619965853 100644 (file)
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -19,7 +19,7 @@
 #define PART_ETHSPEED  "E: %s (%d Mbit/s)"
 #endif
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <net/if_media.h>
 #define IFM_TYPE_MATCH(dt, t)                       \
         (IFM_TYPE((dt)) == 0 || IFM_TYPE((dt)) == IFM_TYPE((t)))
@@ -27,7 +27,7 @@
 #define PART_ETHSPEED  "E: %s (%s)"
 #endif
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__)
 #include <errno.h>
 #include <net/if_media.h>
 #endif
@@ -47,7 +47,7 @@ static int print_eth_speed(char *outwalk, const char *interface) {
                 ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
                 return sprintf(outwalk, "%d Mbit/s", ethspeed);
         } else return sprintf(outwalk, "?");
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
         char *ethspeed;
         struct ifmediareq ifm;
         (void)memset(&ifm, 0, sizeof(ifm));
@@ -69,7 +69,7 @@ static int print_eth_speed(char *outwalk, const char *interface) {
         }
         ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
         return sprintf(outwalk, "%s", ethspeed);
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
        char *ethspeed;
        struct ifmediareq ifmr;