entropy: Port to OpenBSD

[slstatus.git] / components / wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 13b630a..c209598 100644 (file)
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -30,10 +30,11 @@
                                strerror(errno));
                        return NULL;
                }
                                strerror(errno));
                        return NULL;
                }

-               if(!(p = fgets(status, 5, fp)) || strcmp(status, "up\n") != 0) {
+               p = fgets(status, 5, fp);
+               fclose(fp);
+               if(!p || strcmp(status, "up\n") != 0) {

                        return NULL;
                }
                        return NULL;
                }

-               fclose(fp);

 
                if (!(fp = fopen("/proc/net/wireless", "r"))) {
                        fprintf(stderr, "fopen '/proc/net/wireless': %s\n",
 
                if (!(fp = fopen("/proc/net/wireless", "r"))) {
                        fprintf(stderr, "fopen '/proc/net/wireless': %s\n",


@@ -46,11 +47,13 @@
                                break;
                }
                fclose(fp);
                                break;
                }
                fclose(fp);

-               if (i < 2 || !p)
+               if (i < 2 || !p) {

                        return NULL;
                        return NULL;

+               }

 
 

-               if ((datastart = strstr(buf, iface)) == NULL)
+               if (!(datastart = strstr(buf, iface))) {

                        return NULL;
                        return NULL;

+               }

 
                datastart = (datastart+(strlen(iface)+1));
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
 
                datastart = (datastart+(strlen(iface)+1));
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "


@@ -72,23 +75,23 @@
                wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
                snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
 
                wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
                snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
 

-               if (sockfd == -1) {
+               if (sockfd < 0) {

                        fprintf(stderr, "socket 'AF_INET': %s\n",
                                strerror(errno));
                        return NULL;
                }
                wreq.u.essid.pointer = id;
                        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));
+               if (ioctl(sockfd,SIOCGIWESSID, &wreq) < 0) {
+                       fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));

                        close(sockfd);
                        return NULL;
                }
 
                close(sockfd);
 
                        close(sockfd);
                        return NULL;
                }
 
                close(sockfd);
 

-               if (strcmp(id, "") == 0)
+               if (!strcmp(id, "")) {

                        return NULL;
                        return NULL;

+               }

 
                return id;
        }
 
                return id;
        }