X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/1b65dec3064ecc3f317cbe79314a36eb7c95706b..21afb5a8f835a3b6607615f7bb14c3270269b2da:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 86d27eb..8ec68a4 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -3,12 +3,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 <sys/statvfs.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
@@ -30,6 +32,7 @@ char *get_battery();
 char *get_cpu_temperature();
 char *get_cpu_usage();
 char *get_datetime();
+char *get_diskusage();
 char *get_ram_usage();
 char *get_volume();
 char *get_wifi_signal();
@@ -42,9 +45,17 @@ 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;
 }
 
@@ -183,15 +194,32 @@ 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);
 }
 
+/* disk usage percentage */
+char *
+get_diskusage()
+{
+    struct statvfs fs;
+    float perc = 0;
+    if (statvfs(mountpath, &fs) < 0) {
+        fprintf(stderr, "Could not get filesystem info.\n");
+        return smprintf("n/a");
+    }
+    perc = 1.0f - ((float)fs.f_bavail/(float)fs.f_blocks);
+    return smprintf("%2f%%", perc);
+}
+
 /* ram percentage */
 char *
 get_ram_usage()
@@ -331,13 +359,14 @@ main()
     char *cpu_temperature = NULL;
     char *cpu_usage = NULL;
     char *datetime = NULL;
+    char *diskusage = 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");
+        fprintf(stderr, "Config error, please check paths and interval and recompile!\n");
         exit(1);
     }
 
@@ -354,6 +383,7 @@ main()
         cpu_temperature = get_cpu_temperature();
         cpu_usage = get_cpu_usage();
         datetime = get_datetime();
+        diskusage = get_diskusage();
         ram_usage = get_ram_usage();
         volume = get_volume();
         wifi_signal = get_wifi_signal();
@@ -367,6 +397,7 @@ main()
         free(cpu_temperature);
         free(cpu_usage);
         free(datetime);
+        free(diskusage);
         free(ram_usage);
         free(volume);
         free(wifi_signal);