fix: use SYSCONFDIR in error message

[i3/i3status] / src / print_run_watch.c

diff --git a/src/print_run_watch.c b/src/print_run_watch.c
index 455130e91bab049ce1c024e42f75f1b061e5a355..f0a0746b0984d46dfef18267b151b95d2a18c277 100644 (file)
--- a/src/print_run_watch.c
+++ b/src/print_run_watch.c
@@ -1,27 +1,43 @@
+// vim:ts=4:sw=4:expandtab
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 #include "i3status.h"
 
-void print_run_watch(const char *title, const char *pidfile, const char *format) {
-       bool running = process_runs(pidfile);
-       const char *walk;
-
-       printf("%s", (running ? color("color_good") : color("color_bad")));
-
-        for (walk = format; *walk != '\0'; walk++) {
-                if (*walk != '%') {
-                        putchar(*walk);
-                        continue;
-                }
-
-                if (strncmp(walk+1, "title", strlen("title")) == 0) {
-                        printf("%s", title);
-                        walk += strlen("title");
-                } else if (strncmp(walk+1, "status", strlen("status")) == 0) {
-                        printf("%s", (running ? "yes" : "no"));
-                        walk += strlen("status");
-                }
+void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format, const char *format_down) {
+    bool running = process_runs(pidfile);
+    const char *walk;
+    char *outwalk = buffer;
+
+    if (running || format_down == NULL) {
+        walk = format;
+    } else {
+        walk = format_down;
+    }
+
+    INSTANCE(pidfile);
+
+    START_COLOR((running ? "color_good" : "color_bad"));
+
+    for (; *walk != '\0'; walk++) {
+        if (*walk != '%') {
+            *(outwalk++) = *walk;
+
+        } else if (BEGINS_WITH(walk + 1, "title")) {
+            outwalk += sprintf(outwalk, "%s", title);
+            walk += strlen("title");
+
+        } else if (BEGINS_WITH(walk + 1, "status")) {
+            outwalk += sprintf(outwalk, "%s", (running ? "yes" : "no"));
+            walk += strlen("status");
+
+        } else {
+            *(outwalk++) = '%';
         }
+    }
 
-       printf("%s", endcolor());
+    END_COLOR;
+    OUTPUT_FULL_TEXT(buffer);
 }