Implement --version/-v parameter

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index e0139ebca1e8ce68557e2db2efc29a33e6554c54..d8c73895bc8c56779be6b65450fb237b1647d224 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t wireless_opts[] = {
-                CFG_STR("format_up", "W: (%quality at %essid) %ip", CFGF_NONE),
+                CFG_STR("format_up", "W: (%quality at %essid, %bitrate) %ip", CFGF_NONE),
                 CFG_STR("format_down", "W: down", CFGF_NONE),
                 CFG_END()
         };
@@ -181,6 +181,7 @@ int main(int argc, char *argv[]) {
         struct option long_options[] = {
                 {"config", required_argument, 0, 'c'},
                 {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'v'},
                 {0, 0, 0, 0}
         };
 
@@ -195,15 +196,19 @@ int main(int argc, char *argv[]) {
         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)
+        while ((o = getopt_long(argc, argv, "c:hv", long_options, &option_index)) != -1)
                 if ((char)o == 'c')
                         configfile = optarg;
                 else if ((char)o == 'h') {
-                        printf("i3status © 2008-2009 Michael Stapelberg\n"
-                                "Syntax: %s [-c <configfile>]\n", argv[0]);
+                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n"
+                                "Syntax: %s [-c <configfile>] [-h] [-v]\n", argv[0]);
+                        return 0;
+                } else if ((char)o == 'v') {
+                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n");
                         return 0;
                 }
 
+
         if (configfile == NULL)
                 die("No configuration file found\n");
 
@@ -269,7 +274,7 @@ int main(int argc, char *argv[]) {
                         CASE_SEC("ddate")
                                 print_ddate(cfg_getstr(sec, "format"));
 
-                        CASE_SEC("volume")
+                        CASE_SEC_TITLE("volume")
                                 print_volume(cfg_getstr(sec, "format"),
                                              cfg_getstr(sec, "device"),
                                              cfg_getstr(sec, "mixer"),