Fix battery indicator on systems without POWER_SUPPLY_VOLTAGE_NOW.

[i3/i3status] / src / print_eth_info.c

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index d09873ed8aefbd619624601d1a42815b7a1c0259..c446da499fb45bb549b955d6721a402bfb5e9777 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;
 
@@ -90,8 +90,8 @@ static int print_eth_speed(char *outwalk, const char *interface) {
                 * Skip these non-informative values and go right ahead to the
                 * actual speeds.
                 */
-               if (strncmp(desc->ifmt_string, "autoselect", strlen("autoselect")) == 0 ||
-                   strncmp(desc->ifmt_string, "auto", strlen("auto")) == 0)
+               if (BEGINS_WITH(desc->ifmt_string, "autoselect") ||
+                   BEGINS_WITH(desc->ifmt_string, "auto"))
                        continue;
 
                if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) &&
@@ -131,10 +131,10 @@ void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, cons
                         continue;
                 }
 
-                if (strncmp(walk+1, "ip", strlen("ip")) == 0) {
+                if (BEGINS_WITH(walk+1, "ip")) {
                         outwalk += sprintf(outwalk, "%s", ip_address);
                         walk += strlen("ip");
-                } else if (strncmp(walk+1, "speed", strlen("speed")) == 0) {
+                } else if (BEGINS_WITH(walk+1, "speed")) {
                         outwalk += print_eth_speed(outwalk, interface);
                         walk += strlen("speed");
                 }