fflush(stdout) to print line by line if stdout is not a tty

[slstatus.git] / components / ip.c

diff --git a/components/ip.c b/components/ip.c
index 8a40cfe..85ac15e 100644 (file)
--- a/components/ip.c
+++ b/components/ip.c
@@ -1,10 +1,13 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#ifdef __linux__
-#include <err.h>
+#include <errno.h>

 #include <ifaddrs.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>

+#if defined(__OpenBSD__)
+       #include <sys/types.h>
+       #include <sys/socket.h>
+#endif

 
 #include "../util.h"
 
 
 #include "../util.h"
 


@@ -15,19 +18,21 @@ ipv4(const char *iface)
        int s;
        char host[NI_MAXHOST];
 
        int s;
        char host[NI_MAXHOST];
 

-       if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv4 address for interface %s", iface);
+       if (getifaddrs(&ifaddr) < 0) {
+               fprintf(stderr, "getifaddrs: %s\n", strerror(errno));

                return NULL;
        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                return NULL;
        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {

-               if (ifa->ifa_addr == NULL) {
+               if (!ifa->ifa_addr) {

                        continue;
                }
                        continue;
                }

-               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
+               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
+                               NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+               if (!strcmp(ifa->ifa_name, iface) &&
+                   (ifa->ifa_addr->sa_family == AF_INET)) {

                        if (s != 0) {
                        if (s != 0) {

-                               warnx("Failed to get IPv4 address for interface %s", iface);
+                               fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));

                                return NULL;
                        }
                        return bprintf("%s", host);
                                return NULL;
                        }
                        return bprintf("%s", host);


@@ -46,19 +51,21 @@ ipv6(const char *iface)
        int s;
        char host[NI_MAXHOST];
 
        int s;
        char host[NI_MAXHOST];
 

-       if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv6 address for interface %s", iface);
+       if (getifaddrs(&ifaddr) < 0) {
+               fprintf(stderr, "getifaddrs: %s\n", strerror(errno));

                return NULL;
        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                return NULL;
        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {

-               if (ifa->ifa_addr == NULL) {
+               if (!ifa->ifa_addr) {

                        continue;
                }
                        continue;
                }

-               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-               if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) {
+               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host,
+                               NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+               if (!strcmp(ifa->ifa_name, iface) &&
+                   (ifa->ifa_addr->sa_family == AF_INET6)) {

                        if (s != 0) {
                        if (s != 0) {

-                               warnx("Failed to get IPv6 address for interface %s", iface);
+                               fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));

                                return NULL;
                        }
                        return bprintf("%s", host);
                                return NULL;
                        }
                        return bprintf("%s", host);


@@ -69,4 +76,3 @@ ipv6(const char *iface)
 
        return NULL;
 }
 
        return NULL;
 }

-#endif