Update README.md

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index fa627df..fe27be4 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -2,10 +2,14 @@
 
 /* global libraries */
 #include <alsa/asoundlib.h>
+#include <fcntl.h>
+#include <locale.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>
@@ -13,7 +17,14 @@
 /* local libraries */
 #include "config.h"
 
+/* check file macro */
+#define CHECK_FILE(X,Y) do { \
+    if (stat(X,&Y) < 0) return -1; \
+    if (!S_ISREG(Y.st_mode)) return -1; \
+} while (0);
+
 /* functions */
+int config_check();
 void setstatus(char *str);
 char *smprintf(char *fmt, ...);
 char *get_battery();
@@ -27,6 +38,25 @@ char *get_wifi_signal();
 /* global variables */
 static Display *dpy;
 
+/* check configured paths */
+int
+config_check()
+{
+    struct stat fs;
+
+    /* check all files in the config.h file */
+    CHECK_FILE(batterynowfile, fs);
+    CHECK_FILE(batteryfullfile, fs);
+    CHECK_FILE(tempfile, fs);
+
+    /* check update interval */
+    if (update_interval < 1)
+        return -1;
+
+    /* exit successfully */
+    return 0;
+}
+
 /* set statusbar (WM_NAME) */
 void
 setstatus(char *str)
@@ -40,21 +70,10 @@ 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);
-    }
-
+    char *ret = NULL;
     va_start(fmtargs, fmt);
-    vsnprintf(ret, len, fmt, fmtargs);
+    if (vasprintf(&ret, fmt, fmtargs) < 0)
+        return NULL;
     va_end(fmtargs);
 
     return ret;
@@ -70,7 +89,7 @@ get_battery()
     /* open battery now file */
     if (!(fp = fopen(batterynowfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read value */
@@ -82,7 +101,7 @@ get_battery()
     /* open battery full file */
     if (!(fp = fopen(batteryfullfile, "r"))) {
         fprintf(stderr, "Error opening battery file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read value */
@@ -108,7 +127,7 @@ get_cpu_temperature()
     /* open temperature file */
     if (!(fp = fopen(tempfile, "r"))) {
         fprintf(stderr, "Could not open temperature file.\n");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* extract temperature */
@@ -132,7 +151,7 @@ get_cpu_usage()
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read values */
@@ -147,7 +166,7 @@ get_cpu_usage()
     /* open stat file */
     if (!(fp = fopen("/proc/stat","r"))) {
         fprintf(stderr, "Error opening stat file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read values */
@@ -168,16 +187,19 @@ char *
 get_datetime()
 {
     time_t tm;
-    size_t bufsize = 19;
+    size_t bufsize = 64;
     char *buf = malloc(bufsize);
 
     /* get time in format */
     time(&tm);
+    setlocale(LC_TIME, "");
     if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
+        setlocale(LC_TIME, "C");
         fprintf(stderr, "Strftime failed.\n");
-        exit(1);
+        return smprintf("n/a");
     }
 
+    setlocale(LC_TIME, "C");
     /* return time */
     return smprintf("%s", buf);
 }
@@ -193,7 +215,7 @@ get_ram_usage()
     /* open meminfo file */
     if (!(fp = fopen("/proc/meminfo", "r"))) {
         fprintf(stderr, "Error opening meminfo file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read the values */
@@ -274,7 +296,7 @@ get_wifi_signal()
     /* open wifi file */
     if(!(fp = fopen(path, "r"))) {
         fprintf(stderr, "Error opening wifi operstate file.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* read the status */
@@ -285,13 +307,13 @@ get_wifi_signal()
 
     /* 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.");
-        exit(1);
+        return smprintf("n/a");
     }
 
     /* extract the signal strength */
@@ -325,6 +347,12 @@ main()
     char *volume = NULL;
     char *wifi_signal = NULL;
 
+    /* check config for sanity */
+    if (config_check() < 0) {
+        fprintf(stderr, "Config error, please check paths and interval and recompile!\n");
+        exit(1);
+    }
+
     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {
         fprintf(stderr, "Cannot open display!\n");
@@ -354,6 +382,9 @@ main()
         free(ram_usage);
         free(volume);
         free(wifi_signal);
+
+        /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
+        sleep(update_interval -1);
     }
 
     /* close display */