Write information in separate files, define order

[i3/i3status] / wmiistatus.c

diff --git a/wmiistatus.c b/wmiistatus.c
index 269f68135a9d008154532809de906b929e544812..c26781abe0c6e536d7ab8770025d076d67888e67 100644 (file)
--- a/wmiistatus.c
+++ b/wmiistatus.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <stdbool.h>
+#include <stdarg.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -46,24 +47,68 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include "wmiistatus.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
  *
  */
-static void die(const char *message) {
-       write_to_statusbar(message);
+static void die(const char *fmt, ...) {
+       char buffer[512];
+       va_list ap;
+       va_start(ap, fmt);
+       vsprintf(buffer, fmt, ap);
+       va_end(ap);
+
+       write_error_to_statusbar(buffer);
        exit(-1);
 }
 
@@ -96,9 +141,9 @@ static char *get_battery_info() {
        char buf[1024];
        static char part[512];
        char *walk, *last = buf;
-       int fd = open("/sys/class/power_supply/BAT0/uevent", O_RDONLY);
+       int fd = open(battery, O_RDONLY);
        if (fd == -1)
-               die("Could not open /sys/class/power_supply/BAT0/uevent");
+               die("Could not open %s", battery);
        int full_design = -1,
            remaining = -1,
            present_rate = -1;
@@ -232,43 +277,83 @@ static char *get_eth_info() {
        return part;
 }
 
+/*
+ * Checks if the PID in path is still valid by checking if /proc/<pid> exists
+ *
+ */
+static bool process_runs(const char *path) {
+       char pidbuf[512],
+            procbuf[512],
+            *walk;
+       int n;
+       static glob_t globbuf;
+       struct stat statbuf;
+
+       if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0)
+               die("glob() failed");
+       const char *real_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+       int fd = open(real_path, O_RDONLY);
+       globfree(&globbuf);
+       if (fd < 0)
+               return false;
+       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],
             *end;
+       unsigned int i;
+
+       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");
 
        while (1) {
                memset(output, '\0', sizeof(output));
                first_push = true;
 
+               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));
+               }
+
                char *wireless_info = get_wireless_info();
-               push_part(wireless_info, strlen(wireless_info));
+               write_to_statusbar(ORDER_WLAN "wlan", wireless_info);
 
                char *eth_info = get_eth_info();
-               push_part(eth_info, strlen(eth_info));
+               write_to_statusbar(ORDER_ETH "eth", eth_info);
 
                char *battery_info = get_battery_info();
-               push_part(battery_info, strlen(battery_info));
+               write_to_statusbar(ORDER_BATTERY "battery", battery_info);
 
-               
                /* Get load */
                int load_avg = open("/proc/loadavg", O_RDONLY);
+               if (load_avg == -1)
+                       die("Could not open /proc/loadavg");
                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), "%d.%m.%Y %H:%M:%S", current_tm);
-               push_part(part, strlen(part));
-
-               printf("output = %s\n", output);
-
-               int fd = open("/mnt/wmii/rbar/status", O_RDWR);
-               write(fd, output, strlen(output));
-               close(fd);
+               strftime(part, sizeof(part), time_format, current_tm);
+               write_to_statusbar(ORDER_TIME "time", part);
 
                sleep(1);
        }