X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/e046ee18f92569ca67b323757421c5e9b6637d0d..552ba7fd94286135690f3a39f74c8e6f7743d415:/slstatus.c?ds=inline

diff --git a/slstatus.c b/slstatus.c
index 3297e1d..fe27be4 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -3,6 +3,7 @@
 /* global libraries */
 #include <alsa/asoundlib.h>
 #include <fcntl.h>
+#include <locale.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,9 +17,15 @@
 /* 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 */
-void setstatus(char *str);
 int config_check();
+void setstatus(char *str);
 char *smprintf(char *fmt, ...);
 char *get_battery();
 char *get_cpu_temperature();
@@ -31,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)
@@ -53,22 +79,6 @@ smprintf(char *fmt, ...)
     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 *
 get_battery()
@@ -182,11 +192,14 @@ get_datetime()
 
     /* 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");
         return smprintf("n/a");
     }
 
+    setlocale(LC_TIME, "C");
     /* return time */
     return smprintf("%s", buf);
 }
@@ -336,9 +349,10 @@ main()
 
     /* check config for sanity */
     if (config_check() < 0) {
-        fprintf(stderr, "Config error, please check paths and recompile\n");
+        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");
@@ -368,7 +382,9 @@ main()
         free(ram_usage);
         free(volume);
         free(wifi_signal);
-        sleep(update_interval);
+
+        /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
+        sleep(update_interval -1);
     }
 
     /* close display */