Update README, document changes in 3.3 betas

[browser-switch] / main.c

diff --git a/main.c b/main.c
index a366fe7..2e19b84 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * main.c -- config file parsing and main loop for browser-switchboard
  *
 /*
  * main.c -- config file parsing and main loop for browser-switchboard
  *

- * Copyright (C) 2009 Steven Luo
+ * Copyright (C) 2009-2010 Steven Luo

  * Derived from a Python implementation by Jason Simpson and Steven Luo
  *
  * This program is free software; you can redistribute it and/or
  * Derived from a Python implementation by Jason Simpson and Steven Luo
  *
  * This program is free software; you can redistribute it and/or

@@ -22,164 +22,90 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

-#include <stdio.h>
-#include <unistd.h>

 #include <signal.h>
 #include <signal.h>

+#include <errno.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/wait.h>

-#include <regex.h>

 #include <dbus/dbus-glib.h>
 
 #include "browser-switchboard.h"
 #include "launcher.h"
 #include "dbus-server-bindings.h"
 #include <dbus/dbus-glib.h>
 
 #include "browser-switchboard.h"
 #include "launcher.h"
 #include "dbus-server-bindings.h"

-
-#define DEFAULT_HOMEDIR "/home/user"
-#define CONFIGFILE_LOC "/.config/browser-switchboard"
-#define MAXLINE 1024
+#include "config.h"
+#include "log.h"

 
 struct swb_context ctx;
 
 
 struct swb_context ctx;
 

-static void set_config_defaults(struct swb_context *ctx) {
-       if (!ctx)
-               return;
-       free(ctx->other_browser_cmd);
-       ctx->continuous_mode = 0;
-       ctx->default_browser_launcher = NULL;
-       ctx->other_browser_cmd = NULL;
-}
-

 static void waitforzombies(int signalnum) {
        while (waitpid(-1, NULL, WNOHANG) > 0)
 static void waitforzombies(int signalnum) {
        while (waitpid(-1, NULL, WNOHANG) > 0)

-               printf("Waited for a zombie\n");
+               log_msg("Waited for a zombie\n");

 }
 
 static void read_config(int signalnum) {
 }
 
 static void read_config(int signalnum) {

-       char *homedir, *configfile;
-       size_t len;
-       char buf[MAXLINE];
-       char *key, *value;
-       char *default_browser = NULL;
-       FILE *fp;
-       regex_t re_ignore, re_config1, re_config2;
-       regmatch_t substrs[3];
-
-       set_config_defaults(&ctx);
-
-       if (!(homedir = getenv("HOME")))
-               homedir = DEFAULT_HOMEDIR;
-       len = strlen(homedir) + strlen(CONFIGFILE_LOC) + 1;
-       if (!(configfile = calloc(len, sizeof(char))))
-               goto out_noopen;
-       snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC);
-
-       if (!(fp = fopen(configfile, "r")))
-               goto out_noopen;
-
-       /* compile regex matching blank lines or comments */
-       if (regcomp(&re_ignore, "^[[:space:]]*(#|$)", REG_EXTENDED|REG_NOSUB))
-               goto out_nore;
-       /* compile regex matching foo = "bar", with arbitrary whitespace at
-          beginning and end of line and surrounding the = */
-       if (regcomp(&re_config1,
-                   "^[[:space:]]*([^=[:space:]]+)[[:space:]]*=[[:space:]]*\"(.*)\"[[:space:]]*$",
-                   REG_EXTENDED)) {
-               regfree(&re_ignore);
-               goto out_nore;
-       }
-       /* compile regex matching foo = bar, with arbitrary whitespace at
-          beginning of line and surrounding the = */
-       if (regcomp(&re_config2,
-                   "^[[:space:]]*([^=[:space:]]+)[[:space:]]*=[[:space:]]*(.*)$",
-                   REG_EXTENDED|REG_NEWLINE)) {
-               regfree(&re_ignore);
-               regfree(&re_config1);
-               goto out_nore;
-       }
-
-       /* Read in the config file one line at a time and parse it
-          XXX doesn't deal with lines longer than MAXLINE */
-       while (fgets(buf, MAXLINE, fp)) {
-               /* skip blank lines and comments */
-               if (!regexec(&re_ignore, buf, 0, NULL, 0))
-                       continue;
-
-               /* Find the substrings corresponding to the key and value
-                  If the line doesn't match our idea of a config file entry,
-                  skip it */
-               if (regexec(&re_config1, buf, 3, substrs, 0) &&
-                   regexec(&re_config2, buf, 3, substrs, 0))
-                       continue;
-               if (substrs[1].rm_so == -1 || substrs[2].rm_so == -1)
-                       continue;
-
-               /* copy the config value into a new string */
-               len = substrs[2].rm_eo - substrs[2].rm_so;
-               if (!(value = calloc(len+1, sizeof(char))))
-                       goto out;
-               strncpy(value, buf+substrs[2].rm_so, len);
-               /* calloc() zeroes the memory, so string is automatically
-                  null terminated */
-
-               /* make key point to a null-terminated string holding the 
-                  config key */
-               key = buf + substrs[1].rm_so;
-               buf[substrs[1].rm_eo] = '\0';
-
-               if (!strcmp(key, "continuous_mode")) {
-                       ctx.continuous_mode = atoi(value);
-                       free(value);
-               } else if (!strcmp(key, "default_browser")) {
-                       if (!default_browser)
-                               default_browser = value;
-               } else if (!strcmp(key, "other_browser_cmd")) {
-                       if (!ctx.other_browser_cmd)
-                               ctx.other_browser_cmd = value;
-               } else {
-                       /* Don't need this line's contents */
-                       free(value);
+       struct swb_config cfg;
+
+       swb_config_init(&cfg);
+
+       swb_config_load(&cfg);
+
+       log_config(cfg.logging);
+#ifdef FREMANTLE
+       /* continuous mode is required on Fremantle */
+       ctx.continuous_mode = 1;
+       if (!cfg.continuous_mode)
+               log_msg("continuous_mode = 0 operation no longer supported, ignoring config setting\n");
+#else
+       ctx.continuous_mode = cfg.continuous_mode;
+#endif
+       free(ctx.other_browser_cmd);
+       if (cfg.other_browser_cmd) {
+               if (!(ctx.other_browser_cmd = strdup(cfg.other_browser_cmd))) {
+                       log_perror(errno, "Failed to set other_browser_cmd");
+                       exit(1);

                }
                }

-               value = NULL;
-       }
-
-       printf("continuous_mode: %d\n", ctx.continuous_mode);
-       printf("default_browser: '%s'\n", default_browser?default_browser:"NULL");
-       printf("other_browser_cmd: '%s'\n", ctx.other_browser_cmd?ctx.other_browser_cmd:"NULL");
-
-out:
-       regfree(&re_ignore);
-       regfree(&re_config1);
-       regfree(&re_config2);
-out_nore:
-       fclose(fp);
-out_noopen:
-       update_default_browser(&ctx, default_browser);
-       free(configfile);
-       free(default_browser);
+       } else
+               ctx.other_browser_cmd = NULL;
+       update_default_browser(&ctx, cfg.default_browser);
+#ifdef FREMANTLE
+       ctx.autostart_microb = cfg.autostart_microb;
+#endif
+
+       log_msg("continuous_mode: %d\n", cfg.continuous_mode);
+       log_msg("default_browser: '%s'\n", cfg.default_browser);
+       log_msg("other_browser_cmd: '%s'\n",
+               cfg.other_browser_cmd?cfg.other_browser_cmd:"NULL");
+       log_msg("logging: '%s'\n", cfg.logging);
+
+       swb_config_free(&cfg);

        return;
 }
 
 int main() {
        OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
        return;
 }
 
 int main() {
        OssoBrowser *obj_osso_browser, *obj_osso_browser_req;

+       OssoBrowser *obj_osso_browser_sys, *obj_osso_browser_sys_req;

        GMainLoop *mainloop;
        GError *error = NULL;
        GMainLoop *mainloop;
        GError *error = NULL;

+       int reqname_result;

 
        read_config(0);
 
        if (ctx.continuous_mode) {
 
        read_config(0);
 
        if (ctx.continuous_mode) {

+               /* Install signal handlers */

                struct sigaction act;
                act.sa_flags = SA_RESTART;
                struct sigaction act;
                act.sa_flags = SA_RESTART;

-               act.sa_mask = 0;
+               sigemptyset(&(act.sa_mask));

 
 

+               /* SIGCHLD -- clean up after zombies */

                act.sa_handler = waitforzombies;
                if (sigaction(SIGCHLD, &act, NULL) == -1) {
                act.sa_handler = waitforzombies;
                if (sigaction(SIGCHLD, &act, NULL) == -1) {

-                       printf("Installing signal handler failed\n");
+                       log_msg("Installing signal handler failed\n");

                        return 1;
                }
 
                        return 1;
                }
 

+               /* SIGHUP -- reread config file */

                act.sa_handler = read_config;
                if (sigaction(SIGHUP, &act, NULL) == -1) {
                act.sa_handler = read_config;
                if (sigaction(SIGHUP, &act, NULL) == -1) {

-                       printf("Installing signal handler failed\n");
+                       log_msg("Installing signal handler failed\n");

                        return 1;
                }
        }
                        return 1;
                }
        }

@@ -189,33 +115,78 @@ int main() {
        dbus_g_object_type_install_info(OSSO_BROWSER_TYPE,
                        &dbus_glib_osso_browser_object_info);
 
        dbus_g_object_type_install_info(OSSO_BROWSER_TYPE,
                        &dbus_glib_osso_browser_object_info);
 

+       /* Get a connection to the D-Bus session bus */

        ctx.session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
        if (!ctx.session_bus) {
        ctx.session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
        if (!ctx.session_bus) {

-               printf("Couldn't get a D-Bus bus connection\n");
+               log_msg("Couldn't get a D-Bus bus connection\n");

                return 1;
        }
        ctx.dbus_proxy = dbus_g_proxy_new_for_name(ctx.session_bus,
                        "org.freedesktop.DBus", "/org/freedesktop/DBus",
                        "org.freedesktop.DBus");
        if (!ctx.dbus_proxy) {
                return 1;
        }
        ctx.dbus_proxy = dbus_g_proxy_new_for_name(ctx.session_bus,
                        "org.freedesktop.DBus", "/org/freedesktop/DBus",
                        "org.freedesktop.DBus");
        if (!ctx.dbus_proxy) {

-               printf("Couldn't get an org.freedesktop.DBus proxy\n");
+               log_msg("Couldn't get an org.freedesktop.DBus proxy\n");
+               return 1;
+       }
+
+       /* Get the org.maemo.garage.browser-switchboard name from D-Bus, as
+          a form of locking to ensure that not more than one
+          browser-switchboard process is active at any time.  With
+          DBUS_NAME_FLAG_DO_NOT_QUEUE set and DBUS_NAME_FLAG_REPLACE_EXISTING
+          not set, getting the name succeeds if and only if no other
+          process owns the name. */
+       if (!dbus_g_proxy_call(ctx.dbus_proxy, "RequestName", &error,
+                              G_TYPE_STRING, "org.maemo.garage.browser-switchboard",
+                              G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
+                              G_TYPE_INVALID,
+                              G_TYPE_UINT, &reqname_result,
+                              G_TYPE_INVALID)) {
+               log_msg("Couldn't acquire browser-switchboard lock: %s\n",
+                       error->message);
+               return 1;
+       }
+       if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+               log_msg("Another browser-switchboard already running\n");
+               return 1;
+       }
+
+       /* Get a connection to the D-Bus system bus */
+       ctx.system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+       if (!ctx.system_bus) {
+               log_msg("Couldn't get a D-Bus system bus connection\n");
+               return 1;
+       }
+       ctx.dbus_system_proxy = dbus_g_proxy_new_for_name(ctx.system_bus,
+                       "org.freedesktop.DBus", "/org/freedesktop/DBus",
+                       "org.freedesktop.DBus");
+       if (!ctx.dbus_system_proxy) {
+               log_msg("Couldn't get an org.freedesktop.DBus proxy\n");

                return 1;
        }
 
        dbus_request_osso_browser_name(&ctx);
 
                return 1;
        }
 
        dbus_request_osso_browser_name(&ctx);
 

+       /* Register ourselves to handle the osso_browser D-Bus methods */

        obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
        obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);
        obj_osso_browser = g_object_new(OSSO_BROWSER_TYPE, NULL);
        obj_osso_browser_req = g_object_new(OSSO_BROWSER_TYPE, NULL);

+       obj_osso_browser_sys = g_object_new(OSSO_BROWSER_TYPE, NULL);
+       obj_osso_browser_sys_req = g_object_new(OSSO_BROWSER_TYPE, NULL);

        dbus_g_connection_register_g_object(ctx.session_bus,
                        "/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
        dbus_g_connection_register_g_object(ctx.session_bus,
                        "/com/nokia/osso_browser/request",
                        G_OBJECT(obj_osso_browser_req));
        dbus_g_connection_register_g_object(ctx.session_bus,
                        "/com/nokia/osso_browser", G_OBJECT(obj_osso_browser));
        dbus_g_connection_register_g_object(ctx.session_bus,
                        "/com/nokia/osso_browser/request",
                        G_OBJECT(obj_osso_browser_req));

+       dbus_g_connection_register_g_object(ctx.system_bus,
+                       "/com/nokia/osso_browser",
+                       G_OBJECT(obj_osso_browser_sys));
+       dbus_g_connection_register_g_object(ctx.system_bus,
+                       "/com/nokia/osso_browser/request",
+                       G_OBJECT(obj_osso_browser_sys_req));

 
        mainloop = g_main_loop_new(NULL, FALSE);
 
        mainloop = g_main_loop_new(NULL, FALSE);

-       printf("Starting main loop\n");
+       log_msg("Starting main loop\n");

        g_main_loop_run(mainloop);
        g_main_loop_run(mainloop);

-       printf("Main loop completed\n");
+       log_msg("Main loop completed\n");

 
        return 0;
 }
 
        return 0;
 }