X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_path_exists.c;h=65bc9c85028a35aa7283f9bea31afd90c0b98d85;hb=6a19709e65c6aac2085962e989f2429c539c5af5;hp=a2fcb149b041dcb163e1f71761c8e7ea49c3c606;hpb=4f7da73885934a052425fc71861b0c9922c2122f;p=i3%2Fi3status

diff --git a/src/print_path_exists.c b/src/print_path_exists.c
index a2fcb14..65bc9c8 100644
--- a/src/print_path_exists.c
+++ b/src/print_path_exists.c
@@ -1,3 +1,4 @@
+// vim:ts=4:sw=4:expandtab
 #include <stdio.h>
 #include <string.h>
 #include <yajl/yajl_gen.h>
@@ -5,31 +6,37 @@
 #include <sys/stat.h>
 #include "i3status.h"
 
-void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format) {
-        const char *walk;
-        char *outwalk = buffer;
-        struct stat st;
-        const bool exists = (stat(path, &st) == 0);
+void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format, const char *format_down) {
+    const char *walk;
+    char *outwalk = buffer;
+    struct stat st;
+    const bool exists = (stat(path, &st) == 0);
 
-        INSTANCE(path);
+    if (exists || format_down == NULL) {
+        walk = format;
+    } else {
+        walk = format_down;
+    }
 
-        START_COLOR((exists ? "color_good" : "color_bad"));
+    INSTANCE(path);
 
-        for (walk = format; *walk != '\0'; walk++) {
-                if (*walk != '%') {
-                        *(outwalk++) = *walk;
-                        continue;
-                }
+    START_COLOR((exists ? "color_good" : "color_bad"));
 
-                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", (exists ? "yes" : "no"));
-                        walk += strlen("status");
-                }
+    for (; *walk != '\0'; walk++) {
+        if (*walk != '%') {
+            *(outwalk++) = *walk;
+            continue;
         }
 
-        END_COLOR;
-        OUTPUT_FULL_TEXT(buffer);
+        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", (exists ? "yes" : "no"));
+            walk += strlen("status");
+        }
+    }
+
+    END_COLOR;
+    OUTPUT_FULL_TEXT(buffer);
 }