added wifi essid

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index a5807dd..505f25d 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
+#include <linux/wireless.h>
 #include <locale.h>
 #include <netdb.h>
 #include <pwd.h>
@@ -13,10 +14,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
@@ -150,12 +152,17 @@ datetime(const char *timeformat)
     time_t tm;
     size_t bufsize = 64;
     char *buf = malloc(bufsize);
+    if (buf == NULL) {
+        fprintf(stderr, "Failed to get date/time");
+        return smprintf("n/a");
+    }
 
     /* get time in format */
     time(&tm);
     setlocale(LC_TIME, "");
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
         setlocale(LC_TIME, "C");
+        free(buf);
         fprintf(stderr, "Strftime failed.\n");
         return smprintf("n/a");
     }
@@ -448,6 +455,7 @@ ram_used(const char *null)
 char *
 run_command(const char* command)
 {
+    int good;
        FILE *fp;
        char buffer[64];
 
@@ -464,7 +472,15 @@ run_command(const char* command)
        pclose(fp);
 
     /* add nullchar at the end */
-       buffer[strlen(buffer) - 1] = '\0';
+    for (int i = 0 ; i != sizeof(buffer) ; i++) {
+        if (buffer[i] == '\0') {
+            good = 1;
+            break;
+        }
+    }
+    if (good) {
+        buffer[strlen(buffer) - 1] = '\0';
+    }
 
     /* return the output */
        return smprintf("%s", buffer);
@@ -544,36 +560,52 @@ vol_perc(const char *soundcard)
 {
     int mute = 0;
     long vol = 0, max = 0, min = 0;
-
-    /* get volume from alsa */
     snd_mixer_t *handle;
     snd_mixer_elem_t *pcm_mixer, *mas_mixer;
     snd_mixer_selem_id_t *vol_info, *mute_info;
+
+    /* open everything */
     snd_mixer_open(&handle, 0);
     snd_mixer_attach(handle, soundcard);
     snd_mixer_selem_register(handle, NULL, NULL);
     snd_mixer_load(handle);
+
+    /* prepare everything */
     snd_mixer_selem_id_malloc(&vol_info);
     snd_mixer_selem_id_malloc(&mute_info);
+    /* check */
+    if (vol_info == NULL || mute_info == NULL) {
+        fprintf(stderr, "Could not get alsa volume");
+        return smprintf("n/a");
+    }
     snd_mixer_selem_id_set_name(vol_info, channel);
     snd_mixer_selem_id_set_name(mute_info, channel);
     pcm_mixer = snd_mixer_find_selem(handle, vol_info);
     mas_mixer = snd_mixer_find_selem(handle, mute_info);
+
+    /* get the info */
     snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
     snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
     snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-    if (vol_info)
+
+    /* clean up */
+    if (vol_info) {
         snd_mixer_selem_id_free(vol_info);
-    if (mute_info)
+    }
+    if (mute_info) {
         snd_mixer_selem_id_free(mute_info);
-    if (handle)
+    }
+    if (handle) {
         snd_mixer_close(handle);
+    }
 
     /* return the string (mute) */
-    if (!mute)
+    if (!mute) {
         return smprintf("mute");
-    else
+    }
+    else {
         return smprintf("%d%%", (vol * 100) / max);
+    }
 }
 
 /* wifi percentage */
@@ -636,9 +668,48 @@ wifi_perc(const char *wificard)
     return smprintf("%d%%", strength);
 }
 
+/* wifi essid */
+char *
+wifi_essid(const char *wificard)
+{
+    char *id = malloc(IW_ESSID_MAX_SIZE+1);
+    if (id == NULL) {
+        fprintf(stderr, "Cannot get ESSID.");
+        return smprintf("n/a");
+    }
+    int sockfd;
+    struct iwreq wreq;
+
+    /* prepare */
+    memset(&wreq, 0, sizeof(struct iwreq));
+    wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
+
+    /* set the interface */
+    sprintf(wreq.ifr_name, wificard);
+
+    /* check */
+    if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
+        fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
+        return smprintf("n/a");
+    }
+    wreq.u.essid.pointer = id;
+    if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
+        fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard);
+        return smprintf("n/a");
+    }
+
+    /* return the essid */
+    if (strcmp((char *)wreq.u.essid.pointer, "") == 0) {
+        return smprintf("n/a");
+    }
+    else {
+        return smprintf("%s", (char *)wreq.u.essid.pointer);
+    }
+}
+
 /* main function */
 int
-main()
+main(void)
 {
     char status_string[1024];
     struct arg argument;
@@ -659,6 +730,10 @@ main()
             argument = args[i];
             char *res = argument.func(argument.args);
             char *element = smprintf(argument.format, res);
+            if (element == NULL) {
+                element = smprintf("n/a");
+                fprintf(stderr, "Failed to format output.");
+            }
             strcat(status_string, element);
             free(res);
             free(element);