Command-line utility: check that browser is installed before reporting it as the...

When reporting the configured default browser (-b), check to see that
it's installed.  If the configured default browser isn't installed,
report the default default browser instead, since that's what
browser-switchboard will actually use.

diff --git a/config-ui/browser-switchboard-config.c b/config-ui/browser-switchboard-config.c
index 01d301f..752725e 100644 (file)
--- a/config-ui/browser-switchboard-config.c
+++ b/config-ui/browser-switchboard-config.c
@@ -25,9 +25,11 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <getopt.h>
 
 #include "config.h"
+#include "browsers.h"
 
 extern struct swb_config_option swb_config_options[];
 
@@ -67,6 +69,39 @@ static int get_config_value(char *name) {
        return retval;
 }
 
+static int get_default_browser(void) {
+       struct swb_config cfg;
+       int i;
+
+       swb_config_init(&cfg);
+
+       if (!swb_config_load(&cfg))
+               return 1;
+
+       /* Check to see if the configured default browser is installed
+          If not, report the default default browser */
+       for (i = 0; browsers[i].config; ++i) {
+               if (strcmp(browsers[i].config, cfg.default_browser))
+                       continue;
+
+               if (browsers[i].binary && access(browsers[i].binary, X_OK))
+                       printf("%s\n", browsers[0].config);
+               else
+                       printf("%s\n", browsers[i].config);
+
+               break;
+       }
+
+       if (!browsers[i].config)
+               /* Unknown browser configured as default, report the default
+                  default browser */
+               printf("%s\n", browsers[0].config);
+
+       swb_config_free(&cfg);
+
+       return 0;
+}
+
 static int set_config_value(char *name, char *value) {
        struct swb_config cfg;
        struct swb_config_option *optinfo;
@@ -194,6 +229,9 @@ int main(int argc, char **argv) {
                        exit(1);
                }
                return set_config_value(selected_opt, argv[optind]);
-       } else
+       } else if (!strcmp(selected_opt, "default_browser"))
+               /* Default browser value needs special handling */
+               return get_default_browser();
+       else
                return get_config_value(selected_opt);
 }