uptime: Simplifiy and clean up

[slstatus.git] / components / ip.c

diff --git a/components/ip.c b/components/ip.c
index 25071e4..b1f8a05 100644 (file)
--- a/components/ip.c
+++ b/components/ip.c
@@ -1,10 +1,13 @@
 /* See LICENSE file for copyright and license details. */
-#if defined(__linux__)
-#include <err.h>
+#include <errno.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"
 
@@ -16,7 +19,7 @@ ipv4(const char *iface)
        char host[NI_MAXHOST];
 
        if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv4 address for interface %s", iface);
+               fprintf(stderr, "getifaddrs: %s\n", strerror(errno));
                return NULL;
        }
 
@@ -27,7 +30,7 @@ ipv4(const char *iface)
                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)) {
                        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);
@@ -47,7 +50,7 @@ ipv6(const char *iface)
        char host[NI_MAXHOST];
 
        if (getifaddrs(&ifaddr) == -1) {
-               warn("Failed to get IPv6 address for interface %s", iface);
+               fprintf(stderr, "getifaddrs: %s\n", strerror(errno));
                return NULL;
        }
 
@@ -58,7 +61,7 @@ ipv6(const char *iface)
                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)) {
                        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);
@@ -69,4 +72,3 @@ ipv6(const char *iface)
 
        return NULL;
 }
-#endif