Bugfix: Properly skip "consumption", not "consumptionbuf" (Thanks mloskot)

[i3/i3status] / src / print_ip_addr.c

diff --git a/src/print_ip_addr.c b/src/print_ip_addr.c
index 6ddd35a125ef6c6d50e9ea522f1eff29bfa10b4e..909a8b261b697c4b1166dc937a2c0628963117d8 100644 (file)
--- a/src/print_ip_addr.c
+++ b/src/print_ip_addr.c
@@ -1,7 +1,8 @@
 // vim:ts=8:expandtab
-#include <netinet/in.h>
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -22,15 +23,12 @@ const char *get_ip_addr(const char *interface) {
         memset(part, 0, sizeof(part));
 
         struct ifaddrs *ifaddr, *addrp;
+        bool found = false;
 
         getifaddrs(&ifaddr);
 
-        if (ifaddr == NULL) {
-                (void)snprintf(part, sizeof(part), "E: down");
-                return part;
-        }
-
-        addrp = ifaddr;
+        if (ifaddr == NULL)
+                return NULL;
 
         /* Skip until we are at the AF_INET address of interface */
         for (addrp = ifaddr;
@@ -42,8 +40,10 @@ const char *get_ip_addr(const char *interface) {
 
              addrp = addrp->ifa_next) {
                 /* Check if the interface is down */
-                if (strcmp(addrp->ifa_name, interface) == 0 &&
-                    (addrp->ifa_flags & IFF_RUNNING) == 0) {
+                if (strcmp(addrp->ifa_name, interface) != 0)
+                        continue;
+                found = true;
+                if ((addrp->ifa_flags & IFF_RUNNING) == 0) {
                         freeifaddrs(ifaddr);
                         return NULL;
                 }
@@ -51,12 +51,12 @@ const char *get_ip_addr(const char *interface) {
 
         if (addrp == NULL) {
                 freeifaddrs(ifaddr);
-                return "no IP";
+                return (found ? "no IP" : NULL);
         }
 
         int ret;
         if ((ret = getnameinfo(addrp->ifa_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) {
-                fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret));
+                fprintf(stderr, "i3status: getnameinfo(): %s\n", gai_strerror(ret));
                 freeifaddrs(ifaddr);
                 return "no IP";
         }