Unify use of string comparisons

[i3/i3status] / src / print_eth_info.c

diff --git a/src/print_eth_info.c b/src/print_eth_info.c
index 1e877c09be710b742f485267f551bad7e76a299d..c446da499fb45bb549b955d6721a402bfb5e9777 100644 (file)
--- a/src/print_eth_info.c
+++ b/src/print_eth_info.c
@@ -8,6 +8,8 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #include "i3status.h"
 
@@ -17,24 +19,23 @@
 #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)))
 
 #define PART_ETHSPEED  "E: %s (%s)"
-
 #endif
 
-static int print_eth_speed(char *outwalk, const char *interface) {
-#if defined(LINUX)
-        int ethspeed = 0;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-        char *ethspeed;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <errno.h>
+#include <net/if_media.h>
 #endif
 
+static int print_eth_speed(char *outwalk, const char *interface) {
 #if defined(LINUX)
         /* This code path requires root privileges */
+        int ethspeed = 0;
         struct ifreq ifr;
         struct ethtool_cmd ecmd;
 
@@ -46,7 +47,8 @@ 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));
         (void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
@@ -67,6 +69,40 @@ 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__) || defined(__NetBSD__)
+       char *ethspeed;
+       struct ifmediareq ifmr;
+
+       (void) memset(&ifmr, 0, sizeof(ifmr));
+       (void) strlcpy(ifmr.ifm_name, interface, sizeof(ifmr.ifm_name));
+
+       if (ioctl(general_socket, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+                if (errno != E2BIG)
+                       return sprintf(outwalk, "?");
+       }
+
+       struct ifmedia_description *desc;
+       struct ifmedia_description ifm_subtype_descriptions[] =
+           IFM_SUBTYPE_DESCRIPTIONS;
+
+        for (desc = ifm_subtype_descriptions; desc->ifmt_string != NULL; desc++) {
+               /*
+                * Skip these non-informative values and go right ahead to the
+                * actual speeds.
+                */
+               if (BEGINS_WITH(desc->ifmt_string, "autoselect") ||
+                   BEGINS_WITH(desc->ifmt_string, "auto"))
+                       continue;
+
+               if (IFM_TYPE_MATCH(desc->ifmt_word, ifmr.ifm_active) &&
+                   IFM_SUBTYPE(desc->ifmt_word) == IFM_SUBTYPE(ifmr.ifm_active))
+                       break;
+        }
+        ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
+        return sprintf(outwalk, "%s", ethspeed);
+
+#else
+       return sprintf(outwalk, "?");
 #endif
 }
 
@@ -95,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");
                 }