Make runwatches work again

[i3/i3status] / wmiistatus.c

diff --git a/wmiistatus.c b/wmiistatus.c
index 00aa487aab8390490a956d06dd36c54caef64443..c47b5289e05c6b247e52cdb47e858b2790571f2e 100644 (file)
--- a/wmiistatus.c
+++ b/wmiistatus.c
@@ -48,18 +48,55 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <glob.h>
+#include <dirent.h>
 
 #include "wmiistatus.h"
 #include "config.h"
 
-static void write_to_statusbar(const char *message) {
-       int fd = open(wmii_path, O_RDWR);
+static void cleanup_rbar_dir() {
+       struct dirent *ent;
+       DIR *dir;
+       char pathbuf[strlen(wmii_path)+256+1];
+
+       if ((dir = opendir(wmii_path)) == NULL)
+               exit(-3);
+
+       while ((ent = readdir(dir)) != NULL) {
+               if (ent->d_type == DT_REG) {
+                       sprintf(pathbuf, "%s%s", wmii_path, ent->d_name);
+                       unlink(pathbuf);
+               }
+       }
+
+       closedir(dir);
+}
+
+static void create_file(const char *name) {
+       char pathbuf[strlen(wmii_path)+256+1];
+
+       sprintf(pathbuf, "%s%s", wmii_path, name);
+       int fd = creat(pathbuf, S_IRUSR | S_IWUSR);
+       if (fd < 0)
+               exit(-4);
+       close(fd);
+}
+
+static void write_to_statusbar(const char *name, const char *message) {
+       char pathbuf[strlen(wmii_path)+256+1];
+
+       sprintf(pathbuf, "%s%s", wmii_path, name);
+       int fd = open(pathbuf, O_RDWR);
        if (fd == -1)
                exit(-2);
        write(fd, message, strlen(message));
        close(fd);
 }
 
+static void write_error_to_statusbar(const char *message) {
+       cleanup_rbar_dir();
+       write_to_statusbar("error", message);
+}
+
 /*
  * Write errormessage to statusbar and exit
  *
@@ -71,7 +108,7 @@ static void die(const char *fmt, ...) {
        vsprintf(buffer, fmt, ap);
        va_end(ap);
 
-       write_to_statusbar(buffer);
+       write_error_to_statusbar(buffer);
        exit(-1);
 }
 
@@ -87,14 +124,6 @@ static char *skip_character(char *input, char character, int amount) {
        return (walk == input ? walk : walk-1);
 }
 
-static void push_part(const char *input, const int n) {
-       if (first_push)
-               first_push = false;
-       else
-               strncpy(output+strlen(output), " | ", strlen(" | "));
-       strncpy(output+strlen(output), input, n);
-}
-
 /*
  * Get battery information from /sys. Note that it uses the design capacity to calculate the percentage,
  * not the full capacity.
@@ -246,7 +275,9 @@ static char *get_eth_info() {
  */
 static bool process_runs(const char *path) {
        char pidbuf[512],
-            procbuf[512];
+            procbuf[512],
+            *walk;
+       int n;
        static glob_t globbuf;
        struct stat statbuf;
 
@@ -257,34 +288,46 @@ static bool process_runs(const char *path) {
        globfree(&globbuf);
        if (fd < 0)
                return false;
-       read(fd, pidbuf, sizeof(pidbuf));
+       n = read(fd, pidbuf, sizeof(pidbuf));
+       if (n > 0)
+               pidbuf[n] = '\0';
        close(fd);
+       for (walk = pidbuf; *walk != '\0'; walk++)
+               if (!isdigit((int)(*walk))) {
+                       *walk = '\0';
+                       break;
+               }
        sprintf(procbuf, "/proc/%s", pidbuf);
        return (stat(procbuf, &statbuf) >= 0);
 }
 
 int main(void) {
        char part[512],
+            pathbuf[512],
             *end;
        unsigned int i;
 
-       while (1) {
-               memset(output, '\0', sizeof(output));
-               first_push = true;
+       cleanup_rbar_dir();
+       create_file(ORDER_WLAN "wlan");
+       create_file(ORDER_ETH "eth");
+       create_file(ORDER_BATTERY "battery");
+       create_file(ORDER_LOAD "load");
+       create_file(ORDER_TIME "time");
+       for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) {
+               sprintf(pathbuf, "%s%s", ORDER_RUN, run_watches[i]);
+               create_file(pathbuf);
+       }
 
+       while (1) {
                for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) {
                        sprintf(part, "%s: %s", run_watches[i], (process_runs(run_watches[i+1]) ? "yes" : "no"));
-                       push_part(part, strlen(part));
+                       sprintf(pathbuf, "%s%s", ORDER_RUN, run_watches[i]);
+                       write_to_statusbar(pathbuf, part);
                }
 
-               char *wireless_info = get_wireless_info();
-               push_part(wireless_info, strlen(wireless_info));
-
-               char *eth_info = get_eth_info();
-               push_part(eth_info, strlen(eth_info));
-
-               char *battery_info = get_battery_info();
-               push_part(battery_info, strlen(battery_info));
+               write_to_statusbar(ORDER_WLAN "wlan", get_wireless_info());
+               write_to_statusbar(ORDER_ETH "eth", get_eth_info());
+               write_to_statusbar(ORDER_BATTERY "battery", get_battery_info());
 
                /* Get load */
                int load_avg = open("/proc/loadavg", O_RDONLY);
@@ -293,15 +336,14 @@ int main(void) {
                read(load_avg, part, sizeof(part));
                close(load_avg);
                end = skip_character(part, ' ', 3);
-               push_part(part, (end-part));
+               *end = '\0';
+               write_to_statusbar(ORDER_LOAD "load", part);
 
                /* Get date & time */
                time_t current_time = time(NULL);
                struct tm *current_tm = localtime(&current_time);
                strftime(part, sizeof(part), time_format, current_tm);
-               push_part(part, strlen(part));
-
-               write_to_statusbar(output);
+               write_to_statusbar(ORDER_TIME "time", part);
 
                sleep(1);
        }