Fix a bug in wifi_essid().

[slstatus.git] / components / wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 30b57ab..3767b21 100644 (file)
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -14,7 +14,9 @@
 const char *
 wifi_perc(const char *iface)
 {
-       int i, perc;
+       int i, cur;
+       float perc;
+       int total = 70; /* the max of /proc/net/wireless */
        char *p, *datastart;
        char path[PATH_MAX];
        char status[5];
@@ -50,9 +52,11 @@ wifi_perc(const char *iface)
                return NULL;
 
        datastart = (datastart+(strlen(iface)+1));
-       sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
+       sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &cur);
 
-       return bprintf("%d", perc);
+       perc = (float)cur / total * 100.0;
+
+       return bprintf("%.0f", perc);
 }
 
 const char *
@@ -73,6 +77,7 @@ wifi_essid(const char *iface)
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
                warn("Failed to get ESSID for interface %s", iface);
+               close(sockfd);
                return NULL;
        }