Fix FTBFS on kFreeBSD and Hurd: libiw is Linux-only

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index c9ded2f9b2043df71cb9a37bd5778a26fe352fb1..f2d055def82dda7c41ce17fb3317358621efdaa0 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -19,6 +19,9 @@
 #include <getopt.h>
 #include <signal.h>
 #include <confuse.h>
+#include <glob.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "i3status.h"
 
@@ -37,10 +40,32 @@ void sigpipe(int signum) {
         exit(1);
 }
 
+/*
+ * Checks if there is a file at the given path (expanding ~) and returns the
+ * full path if so or NULL if there is no file.
+ *
+ */
+static char *file_exists(char *path) {
+        static glob_t globbuf;
+        struct stat buf;
+        char *full_path = NULL;
+
+        if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0)
+                return NULL;
+
+        full_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+
+        if (stat(full_path, &buf) < 0)
+                return NULL;
+
+        return full_path;
+}
+
 int main(int argc, char *argv[]) {
         unsigned int j;
 
         cfg_opt_t general_opts[] = {
+                CFG_STR("output_format", "dzen2", CFGF_NONE),
                 CFG_BOOL("colors", 1, CFGF_NONE),
                 CFG_INT("interval", 1, CFGF_NONE),
                 CFG_END()
@@ -70,7 +95,7 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t battery_opts[] = {
-                CFG_STR("format", "%status %remaining", CFGF_NONE),
+                CFG_STR("format", "%status %percentage %remaining", CFGF_NONE),
                 CFG_BOOL("last_full_capacity", false, CFGF_NONE),
                 CFG_END()
         };
@@ -110,7 +135,7 @@ int main(int argc, char *argv[]) {
                 CFG_END()
         };
 
-        char *configfile = PREFIX "/etc/i3status.conf";
+        char *configfile;
         int o, option_index = 0;
         struct option long_options[] = {
                 {"config", required_argument, 0, 'c'},
@@ -123,6 +148,12 @@ int main(int argc, char *argv[]) {
         action.sa_handler = sigpipe;
         sigaction(SIGPIPE, &action, NULL);
 
+        /* Figure out which configuration file to use before the user may
+         * override this setting using -c */
+
+        if ((configfile = file_exists("~/.i3status.conf")) == NULL)
+                configfile = file_exists(PREFIX "/etc/i3status.conf");
+
         while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1)
                 if ((char)o == 'c')
                         configfile = optarg;
@@ -132,11 +163,25 @@ int main(int argc, char *argv[]) {
                         return 0;
                 }
 
+        if (configfile == NULL)
+                die("No configuration file found\n");
+
         cfg = cfg_init(opts, CFGF_NONE);
         if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR)
                 return EXIT_FAILURE;
 
         cfg_general = cfg_getsec(cfg, "general");
+        if (cfg_general == NULL)
+                die("Could not get section \"general\"\n");
+
+        char *output_str = cfg_getstr(cfg_general, "output_format");
+        if (strcasecmp(output_str, "dzen2") == 0)
+                output_format = O_DZEN2;
+        else if (strcasecmp(output_str, "xmobar") == 0)
+                output_format = O_XMOBAR;
+        else if (strcasecmp(output_str, "none") == 0)
+                output_format = O_NONE;
+        else die("Unknown output format: \"%s\"\n", output_str);
 
         if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
                 die("Could not create socket\n");