slstatus

commit 97ff66522c098ddd8f0c106deae1c5065cdb5920
parent 19f3c8f545237f9db5e994220f3529b192b4bf39
Author: Quentin Rameau <quinq@fifth.space>
Date:   Mon, 30 Apr 2018 15:14:39 +0200

wifi: OS split

Diffstat:
M
Makefile
 | 
2
+-
A
components/Linux/wifi.c
 | 
90
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
components/OpenBSD/wifi.c
 | 
0

D
components/wifi.c
 | 
92
-------------------------------------------------------------------------------

4 files changed, 91 insertions(+), 93 deletions(-)
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ COM =\
 	components/$(OS)/uptime \
 	components/user\
 	components/volume\
-	components/wifi
+	components/$(OS)/wifi
 
 all: slstatus
 
diff --git a/components/Linux/wifi.c b/components/Linux/wifi.c
@@ -0,0 +1,90 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <ifaddrs.h>
+#include <linux/wireless.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "../../util.h"
+
+const char *
+wifi_perc(const char *iface)
+{
+	int i, cur;
+	float perc;
+	int total = 70; /* the max of /proc/net/wireless */
+	char *p, *datastart;
+	char path[PATH_MAX];
+	char status[5];
+	FILE *fp;
+
+	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
+	fp = fopen(path, "r");
+	if (fp == NULL) {
+		fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
+		return NULL;
+	}
+	p = fgets(status, 5, fp);
+	fclose(fp);
+	if(!p || strcmp(status, "up\n") != 0) {
+		return NULL;
+	}
+
+	fp = fopen("/proc/net/wireless", "r");
+	if (fp == NULL) {
+		fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno));
+		return NULL;
+	}
+
+	for (i = 0; i < 3; i++) {
+		if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
+			break;
+	}
+	fclose(fp);
+	if (i < 2 || !p)
+		return NULL;
+
+	if ((datastart = strstr(buf, iface)) == NULL)
+		return NULL;
+
+	datastart = (datastart+(strlen(iface)+1));
+	sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &cur);
+
+	perc = (float)cur / total * 100.0;
+
+	return bprintf("%.0f", perc);
+}
+
+const char *
+wifi_essid(const char *iface)
+{
+	static char id[IW_ESSID_MAX_SIZE+1];
+	int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+	struct iwreq wreq;
+
+	memset(&wreq, 0, sizeof(struct iwreq));
+	wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
+	snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+
+	if (sockfd == -1) {
+		fprintf(stderr, "socket 'AF_INET': %s\n", strerror(errno));
+		return NULL;
+	}
+	wreq.u.essid.pointer = id;
+	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
+		fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
+		close(sockfd);
+		return NULL;
+	}
+
+	close(sockfd);
+
+	if (strcmp(id, "") == 0)
+		return NULL;
+	else
+		return id;
+}
diff --git a/components/OpenBSD/wifi.c b/components/OpenBSD/wifi.c
diff --git a/components/wifi.c b/components/wifi.c
@@ -1,92 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#if defined(__linux__)
-#include <errno.h>
-#include <ifaddrs.h>
-#include <linux/wireless.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "../util.h"
-
-const char *
-wifi_perc(const char *iface)
-{
-	int i, cur;
-	float perc;
-	int total = 70; /* the max of /proc/net/wireless */
-	char *p, *datastart;
-	char path[PATH_MAX];
-	char status[5];
-	FILE *fp;
-
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
-	fp = fopen(path, "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
-		return NULL;
-	}
-	p = fgets(status, 5, fp);
-	fclose(fp);
-	if(!p || strcmp(status, "up\n") != 0) {
-		return NULL;
-	}
-
-	fp = fopen("/proc/net/wireless", "r");
-	if (fp == NULL) {
-		fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno));
-		return NULL;
-	}
-
-	for (i = 0; i < 3; i++) {
-		if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
-			break;
-	}
-	fclose(fp);
-	if (i < 2 || !p)
-		return NULL;
-
-	if ((datastart = strstr(buf, iface)) == NULL)
-		return NULL;
-
-	datastart = (datastart+(strlen(iface)+1));
-	sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &cur);
-
-	perc = (float)cur / total * 100.0;
-
-	return bprintf("%.0f", perc);
-}
-
-const char *
-wifi_essid(const char *iface)
-{
-	static char id[IW_ESSID_MAX_SIZE+1];
-	int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-	struct iwreq wreq;
-
-	memset(&wreq, 0, sizeof(struct iwreq));
-	wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
-	snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
-
-	if (sockfd == -1) {
-		fprintf(stderr, "socket 'AF_INET': %s\n", strerror(errno));
-		return NULL;
-	}
-	wreq.u.essid.pointer = id;
-	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-		fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
-		close(sockfd);
-		return NULL;
-	}
-
-	close(sockfd);
-
-	if (strcmp(id, "") == 0)
-		return NULL;
-	else
-		return id;
-}
-#endif