Make temp more readable on Linux

[slstatus.git] / components / wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 591f6ad..389adab 100644 (file)
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -23,8 +23,11 @@
                char status[5];
                FILE *fp;
 
                char status[5];
                FILE *fp;
 

-               snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface,
-                        "/operstate");
+               if (esnprintf(path, sizeof(path),
+                             "/sys/class/net/%s/operstate",
+                             iface) < 0) {
+                       return NULL;
+               }

                if (!(fp = fopen(path, "r"))) {
                        warn("fopen '%s':", path);
                        return NULL;
                if (!(fp = fopen(path, "r"))) {
                        warn("fopen '%s':", path);
                        return NULL;


@@ -57,7 +60,7 @@
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
                       "%*d\t\t%*d\t\t %*d\t  %*d\t\t %*d", &cur);
 
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
                       "%*d\t\t%*d\t\t %*d\t  %*d\t\t %*d", &cur);
 

-               return bprintf("%d", (int)((float)cur / total * 100));
+               return bprintf("%d%%", (int)((float)cur / total * 100));

        }
 
        const char *
        }
 
        const char *


@@ -69,7 +72,10 @@
 
                memset(&wreq, 0, sizeof(struct iwreq));
                wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
 
                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 (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name),
+                             "%s", iface) < 0) {
+                       return NULL;
+               }

 
                if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
                        warn("socket 'AF_INET':");
 
                if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
                        warn("socket 'AF_INET':");


@@ -141,7 +147,7 @@
                                q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
                                (2 * (nr.nr_rssi + 100)));
                        }
                                q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
                                (2 * (nr.nr_rssi + 100)));
                        }

-                       return bprintf("%d", q);
+                       return bprintf("%d%%", q);

                }
 
                return NULL;
                }
 
                return NULL;