Merge pull request #6 from sahne/master

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index cb6282f..3297e1d 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -2,10 +2,13 @@
 
 /* global libraries */
 #include <alsa/asoundlib.h>
 
 /* global libraries */
 #include <alsa/asoundlib.h>

+#include <fcntl.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/types.h>
+#include <sys/stat.h>

 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>


@@ -15,14 +18,15 @@
 
 /* functions */
 void setstatus(char *str);
 
 /* functions */
 void setstatus(char *str);

-char *battery();
-char *cpu_temperature();
-char *cpu_usage();
-char *datetime();
-char *ram_usage();
+int config_check();

 char *smprintf(char *fmt, ...);
 char *smprintf(char *fmt, ...);

-char *volume();
-char *wifi_signal();
+char *get_battery();
+char *get_cpu_temperature();
+char *get_cpu_usage();
+char *get_datetime();
+char *get_ram_usage();
+char *get_volume();
+char *get_wifi_signal();

 
 /* global variables */
 static Display *dpy;
 
 /* global variables */
 static Display *dpy;


@@ -35,21 +39,51 @@ setstatus(char *str)
     XSync(dpy, False);
 }
 
     XSync(dpy, False);
 }
 

+/* smprintf function */
+char *
+smprintf(char *fmt, ...)
+{
+    va_list fmtargs;
+    char *ret = NULL;
+    va_start(fmtargs, fmt);
+    if (vasprintf(&ret, fmt, fmtargs) < 0)
+        return NULL;
+    va_end(fmtargs);
+
+    return ret;
+}
+
+#define CHECK_FILE(X,Y) do { \
+    if (stat(X,&Y) < 0) return -1; \
+    if (!S_ISREG(Y.st_mode)) return -1; \
+} while (0);
+
+/* check configured paths */
+int
+config_check()
+{
+    struct stat fs;
+    CHECK_FILE(batterynowfile, fs);
+    CHECK_FILE(batteryfullfile, fs);
+    CHECK_FILE(tempfile, fs);
+    return 0;
+}
+

 /* battery percentage */
 char *
 /* battery percentage */
 char *

-battery()
+get_battery()

 {
 {

-    int battery_now, battery_full, battery_perc;
+    int now, full, perc;

     FILE *fp;
 
     /* open battery now file */
     if (!(fp = fopen(batterynowfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
     FILE *fp;
 
     /* open battery now file */
     if (!(fp = fopen(batterynowfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read value */
     }
 
     /* read value */

-    fscanf(fp, "%i", &battery_now);
+    fscanf(fp, "%i", &now);

 
     /* close battery now file */
     fclose(fp);
 
     /* close battery now file */
     fclose(fp);


@@ -57,25 +91,25 @@ battery()
     /* open battery full file */
     if (!(fp = fopen(batteryfullfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
     /* open battery full file */
     if (!(fp = fopen(batteryfullfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read value */
     }
 
     /* read value */

-    fscanf(fp, "%i", &battery_full);
+    fscanf(fp, "%i", &full);

 
     /* close battery full file */
     fclose(fp);
 
     /* calculate percent */
 
     /* close battery full file */
     fclose(fp);
 
     /* calculate percent */

-    battery_perc = battery_now / (battery_full / 100);
+    perc = now / (full / 100);

 
 

-    /* return batt_perc as string */
-    return smprintf("%d%%", battery_perc);
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* cpu temperature */
 char *
 }
 
 /* cpu temperature */
 char *

-cpu_temperature()
+get_cpu_temperature()

 {
     int temperature;
     FILE *fp;
 {
     int temperature;
     FILE *fp;


@@ -83,7 +117,7 @@ cpu_temperature()
     /* open temperature file */
     if (!(fp = fopen(tempfile, "r"))) {
         fprintf(stderr, "Could not open temperature file.\n");
     /* open temperature file */
     if (!(fp = fopen(tempfile, "r"))) {
         fprintf(stderr, "Could not open temperature file.\n");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* extract temperature */
     }
 
     /* extract temperature */


@@ -98,16 +132,16 @@ cpu_temperature()
 
 /* cpu percentage */
 char *
 
 /* cpu percentage */
 char *

-cpu_usage()
+get_cpu_usage()

 {
 {

-    int cpu_perc;
+    int perc;

     long double a[4], b[4];
     FILE *fp;
 
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
     long double a[4], b[4];
     FILE *fp;
 
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read values */
     }
 
     /* read values */


@@ -122,7 +156,7 @@ cpu_usage()
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read values */
     }
 
     /* read values */


@@ -132,92 +166,68 @@ cpu_usage()
     fclose(fp);
 
     /* calculate avg in this second */
     fclose(fp);
 
     /* calculate avg in this second */

-    cpu_perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
+    perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));

 
 

-    /* return cpu_perc as string */
-    return smprintf("%d%%", cpu_perc);
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* date and time */
 char *
 }
 
 /* date and time */
 char *

-datetime()
+get_datetime()

 {
     time_t tm;
 {
     time_t tm;

-    size_t bufsize = 19;
+    size_t bufsize = 64;

     char *buf = malloc(bufsize);
 
     /* get time in format */
     time(&tm);
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
         fprintf(stderr, "Strftime failed.\n");
     char *buf = malloc(bufsize);
 
     /* get time in format */
     time(&tm);
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
         fprintf(stderr, "Strftime failed.\n");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* return time */
     }
 
     /* return time */

-    return buf;
+    return smprintf("%s", buf);

 }
 
 /* ram percentage */
 char *
 }
 
 /* ram percentage */
 char *

-ram_usage()
+get_ram_usage()

 {
 {

-    int ram_perc;
-    long total, free, available;
+    int perc;
+    long total, free, buffers, cached;

     FILE *fp;
 
     /* open meminfo file */
     if (!(fp = fopen("/proc/meminfo", "r"))) {
         fprintf(stderr, "Error opening meminfo file.");
     FILE *fp;
 
     /* open meminfo file */
     if (!(fp = fopen("/proc/meminfo", "r"))) {
         fprintf(stderr, "Error opening meminfo file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read the values */
     fscanf(fp, "MemTotal: %ld kB\n", &total);
     fscanf(fp, "MemFree: %ld kB\n", &free);
     }
 
     /* read the values */
     fscanf(fp, "MemTotal: %ld kB\n", &total);
     fscanf(fp, "MemFree: %ld kB\n", &free);

-    fscanf(fp, "MemAvailable: %ld kB\n", &available);
+    fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
+    fscanf(fp, "Cached: %ld kB\n", &cached);

 
     /* close meminfo file */
     fclose(fp);
 
     /* calculate percentage */
 
     /* close meminfo file */
     fclose(fp);
 
     /* calculate percentage */

-    ram_perc = 100 * (total - available) / total;
-
-    /* return ram_perc as string */
-    return smprintf("%d%%",ram_perc);
-}
-
-/* smprintf function */
-char *
-smprintf(char *fmt, ...)
-{
-    va_list fmtargs;
-    char *ret;
-    int len;
-
-    va_start(fmtargs, fmt);
-    len = vsnprintf(NULL, 0, fmt, fmtargs);
-    va_end(fmtargs);
-
-    ret = malloc(++len);
-    if (ret == NULL) {
-        fprintf(stderr, "Malloc error.");
-        exit(1);
-    }
+    perc = 100 * ((total - free) - (buffers + cached)) / total;

 
 

-    va_start(fmtargs, fmt);
-    vsnprintf(ret, len, fmt, fmtargs);
-    va_end(fmtargs);
-
-    return ret;
+    /* return perc as string */
+    return smprintf("%d%%", perc);

 }
 
 /* alsa volume percentage */
 char *
 }
 
 /* alsa volume percentage */
 char *

-volume()
+get_volume()

 {
     int mute = 0;
     long vol = 0, max = 0, min = 0;
 {
     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;
     /* get volume from alsa */
     snd_mixer_t *handle;
     snd_mixer_elem_t *pcm_mixer, *mas_mixer;


@@ -232,12 +242,9 @@ volume()
     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);
     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);

-    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);
+    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)
         snd_mixer_selem_id_free(vol_info);
     if (mute_info)
     if (vol_info)
         snd_mixer_selem_id_free(vol_info);
     if (mute_info)


@@ -254,7 +261,7 @@ volume()
 
 /* wifi percentage */
 char *
 
 /* wifi percentage */
 char *

-wifi_signal()
+get_wifi_signal()

 {
     int bufsize = 255;
     int strength;
 {
     int bufsize = 255;
     int strength;


@@ -264,9 +271,11 @@ wifi_signal()
     char path_end[11] = "/operstate";
     char path[32];
     char status[5];
     char path_end[11] = "/operstate";
     char path[32];
     char status[5];

+    char needle[sizeof wificard + 1];

     FILE *fp;
 
     /* generate the path name */
     FILE *fp;
 
     /* generate the path name */

+    memset(path, 0, sizeof path);

     strcat(path, path_start);
     strcat(path, wificard);
     strcat(path, path_end);
     strcat(path, path_start);
     strcat(path, wificard);
     strcat(path, path_end);


@@ -274,7 +283,7 @@ wifi_signal()
     /* open wifi file */
     if(!(fp = fopen(path, "r"))) {
         fprintf(stderr, "Error opening wifi operstate file.");
     /* open wifi file */
     if(!(fp = fopen(path, "r"))) {
         fprintf(stderr, "Error opening wifi operstate file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* read the status */
     }
 
     /* read the status */


@@ -285,20 +294,22 @@ wifi_signal()
 
     /* check if interface down */
     if(strcmp(status, "up\n") != 0){
 
     /* check if interface down */
     if(strcmp(status, "up\n") != 0){

-        return "n/a";
+        return smprintf("n/a");

     }
 
     /* open wifi file */
     if (!(fp = fopen("/proc/net/wireless", "r"))) {
         fprintf(stderr, "Error opening wireless file.");
     }
 
     /* open wifi file */
     if (!(fp = fopen("/proc/net/wireless", "r"))) {
         fprintf(stderr, "Error opening wireless file.");

-        exit(1);
+        return smprintf("n/a");

     }
 
     /* extract the signal strength */
     }
 
     /* extract the signal strength */

+    strcpy(needle, wificard);
+    strcat(needle, ":");

     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);

-    if ((datastart = strstr(buf, "wlp3s0:")) != NULL) {
+    if ((datastart = strstr(buf, needle)) != NULL) {

         datastart = strstr(buf, ":");
         sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
     }
         datastart = strstr(buf, ":");
         sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
     }


@@ -315,39 +326,49 @@ int
 main()
 {
     char status[1024];
 main()
 {
     char status[1024];

-
+    char *battery = NULL;
+    char *cpu_temperature = NULL;
+    char *cpu_usage = NULL;
+    char *datetime = NULL;
+    char *ram_usage = NULL;
+    char *volume = NULL;
+    char *wifi_signal = NULL;
+
+    /* check config for sanity */
+    if (config_check() < 0) {
+        fprintf(stderr, "Config error, please check paths and recompile\n");
+        exit(1);
+    }

     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {
         fprintf(stderr, "Cannot open display!\n");
         exit(1);
     }
 
     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {
         fprintf(stderr, "Cannot open display!\n");
         exit(1);
     }
 

-    char *pWifi_signal = NULL;
-    char *pBattery = NULL;
-    char *pCpu_usage = NULL;
-    char *pCpu_temperature = NULL;
-    char *pRam_usage = NULL;
-    char *pVolume = NULL;
-    char *pDatetime = NULL;
-
-    /* return status every second */   
+    /* return status every second */

     for (;;) {
     for (;;) {

-        pWifi_signal = wifi_signal();
-        pBattery = battery();
-        pCpu_usage = cpu_usage();
-        pCpu_temperature = cpu_temperature();
-        pRam_usage = ram_usage();
-        pVolume = volume();
-        pDatetime = datetime();
+        /* assign the values */
+        battery = get_battery();
+        cpu_temperature = get_cpu_temperature();
+        cpu_usage = get_cpu_usage();
+        datetime = get_datetime();
+        ram_usage = get_ram_usage();
+        volume = get_volume();
+        wifi_signal = get_wifi_signal();
+
+        /* return the status */

         sprintf(status, FORMATSTRING, ARGUMENTS);
         setstatus(status);
         sprintf(status, FORMATSTRING, ARGUMENTS);
         setstatus(status);

-        free(pWifi_signal);
-        free(pBattery);
-        free(pCpu_usage);
-        free(pCpu_temperature);
-        free(pRam_usage);
-        free(pVolume);
-        free(pDatetime);
+
+        /* free the values */
+        free(battery);
+        free(cpu_temperature);
+        free(cpu_usage);
+        free(datetime);
+        free(ram_usage);
+        free(volume);
+        free(wifi_signal);
+        sleep(update_interval);

     }
 
     /* close display */
     }
 
     /* close display */