X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=57c2246dfbf808c573e20c1991d127f6a3558f10;hp=ec1a04213a57187d0621576cce4a4e77dd8bbedb;hb=663c89819b6990c99427d1cf5b0fcae21e4201bc;hpb=7d3b3e8a206bffae1e491f5887ab1aaaf69e4759 diff --git a/main.c b/main.c index ec1a042..57c2246 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 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -32,14 +31,11 @@ #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 "configfile.h" struct swb_context ctx; -static void set_config_defaults(struct swb_context * ctx) { +static void set_config_defaults(struct swb_context *ctx) { if (!ctx) return; free(ctx->other_browser_cmd); @@ -54,66 +50,42 @@ static void waitforzombies(int signalnum) { } 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; + FILE *fp; + int continuous_mode_seen = 0; + struct swb_config_line line; + char *default_browser = NULL; 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"))) + if (!(fp = open_config_file())) 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); + /* Parse the config file + TODO: should we handle errors differently than EOF? */ + if (!parse_config_file_begin()) + goto out; + while (!parse_config_file_line(fp, &line)) { + if (line.parsed) { + if (!strcmp(line.key, "continuous_mode")) { + if (!continuous_mode_seen) { + ctx.continuous_mode = atoi(line.value); + continuous_mode_seen = 1; + } + free(line.value); + } else if (!strcmp(line.key, "default_browser")) { + if (!default_browser) + default_browser = line.value; + } else if (!strcmp(line.key, "other_browser_cmd")) { + if (!ctx.other_browser_cmd) + ctx.other_browser_cmd = line.value; + } else { + /* Don't need this line's contents */ + free(line.value); + } } - value = NULL; + free(line.key); } + parse_config_file_end(); printf("continuous_mode: %d\n", ctx.continuous_mode); printf("default_browser: '%s'\n", default_browser?default_browser:"NULL"); @@ -123,28 +95,32 @@ out: fclose(fp); out_noopen: update_default_browser(&ctx, default_browser); - free(configfile); free(default_browser); return; } int main() { - OssoBrowser * obj; - GMainLoop * mainloop; - GError * error = NULL; + OssoBrowser *obj_osso_browser, *obj_osso_browser_req; + 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"); return 1; } + /* SIGHUP -- reread config file */ act.sa_handler = read_config; if (sigaction(SIGHUP, &act, NULL) == -1) { printf("Installing signal handler failed\n"); @@ -157,6 +133,7 @@ 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"); @@ -170,13 +147,37 @@ int main() { 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)) { + printf("Couldn't acquire browser-switchboard lock: %s\n", + error->message); + return 1; + } + if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + printf("Another browser-switchboard already running\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); dbus_g_connection_register_g_object(ctx.session_bus, - "/com/nokia/osso_browser", G_OBJECT(obj)); + "/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)); + "/com/nokia/osso_browser/request", + G_OBJECT(obj_osso_browser_req)); mainloop = g_main_loop_new(NULL, FALSE); printf("Starting main loop\n");