X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=c148bacae7390b9448d28b7bcddc2a7339510e9e;hp=ec1a04213a57187d0621576cce4a4e77dd8bbedb;hb=refs%2Fheads%2Ffremantle-package;hpb=7d3b3e8a206bffae1e491f5887ab1aaaf69e4759 diff --git a/main.c b/main.c index ec1a042..c148bac 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* * 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 @@ -22,9 +22,8 @@ #include #include -#include -#include #include +#include #include #include #include @@ -32,122 +31,82 @@ #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; -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) - printf("Waited for a zombie\n"); + log_msg("Waited for a zombie\n"); } static void read_config(int signalnum) { - char * homedir; - char * configfile; - size_t len; - char buf[MAXLINE]; - char * tmp; - char * value; - char * default_browser = NULL; - FILE * fp; - - 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; - strncpy(configfile, homedir, strlen(homedir)); - strncat(configfile, CONFIGFILE_LOC, strlen(CONFIGFILE_LOC)); - - if (!(fp = fopen(configfile, "r"))) - goto out_noopen; - - /* 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 comments */ - if (buf[0] == '#') - continue; - /* look for the = in the line */ - if (!(tmp = strchr(buf, '='))) - continue; - - /* split the line into parameter (before =, in buf) and - value (after =, in value) */ - if (!(value = calloc(strlen(tmp+1)+1, sizeof(char)))) - goto out; - strncpy(value, tmp+1, strlen(tmp+1)); - value[strlen(tmp+1)] = '\0'; - /* scribble over the = in buf with a \0 -- that makes buf - just the parameter name */ - *tmp = '\0'; - /* if we find a newline in value, replace that with a \0 too */ - if ((tmp = strchr(value, '\n'))) - *tmp = '\0'; - - if (!strcmp(buf, "continuous_mode")) { - ctx.continuous_mode = atoi(value); - free(value); - } else if (!strcmp(buf, "default_browser")) { - if (!default_browser) - default_browser = value; - } else if (!strcmp(buf, "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: - 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; - GMainLoop * mainloop; - GError * error = NULL; + OssoBrowser *obj_osso_browser, *obj_osso_browser_sys; + OssoBrowser *obj_osso_browser_req, *obj_osso_browser_sys_req; + OssoBrowser *obj_osso_browser_root, *obj_osso_browser_sys_root; + GMainLoop *mainloop; + GError *error = NULL; + int reqname_result; read_config(0); if (ctx.continuous_mode) { + /* Install signal handlers */ struct sigaction act; act.sa_flags = SA_RESTART; + sigemptyset(&(act.sa_mask)); + /* SIGCHLD -- clean up after zombies */ 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; } + /* SIGHUP -- reread config file */ 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; } } @@ -157,31 +116,84 @@ int main() { 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) { - 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) { - 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); - obj = g_object_new(OSSO_BROWSER_TYPE, NULL); + /* 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_root = 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); + obj_osso_browser_sys_root = 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", G_OBJECT(obj)); + "/com/nokia/osso_browser/request", + G_OBJECT(obj_osso_browser_req)); dbus_g_connection_register_g_object(ctx.session_bus, - "/com/nokia/osso_browser/request", G_OBJECT(obj)); + "/", G_OBJECT(obj_osso_browser_root)); + 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)); + dbus_g_connection_register_g_object(ctx.system_bus, + "/", G_OBJECT(obj_osso_browser_sys_root)); mainloop = g_main_loop_new(NULL, FALSE); - printf("Starting main loop\n"); + log_msg("Starting main loop\n"); g_main_loop_run(mainloop); - printf("Main loop completed\n"); + log_msg("Main loop completed\n"); return 0; }