/*
* 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
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
#include <signal.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 "configfile.h"
+#include "log.h"
struct swb_context ctx;
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) {
FILE *fp;
- regex_t re_ignore, re_config1, re_config2;
- regmatch_t substrs[3];
- char buf[MAXLINE];
- char *key, *value;
- char *default_browser = NULL;
- size_t len;
+ int continuous_mode_seen = 0;
+ struct swb_config_line line;
+ char *default_browser = NULL, *logger_name = NULL;
set_config_defaults(&ctx);
if (!(fp = open_config_file()))
goto out_noopen;
- /* compile regex matching blank lines or comments */
- if (regcomp(&re_ignore, REGEX_IGNORE, REGEX_IGNORE_FLAGS))
- goto out_nore;
- /* compile regex matching foo = "bar", with arbitrary whitespace at
- beginning and end of line and surrounding the = */
- if (regcomp(&re_config1, REGEX_CONFIG1, REGEX_CONFIG1_FLAGS)) {
- 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, REGEX_CONFIG2, REGEX_CONFIG2_FLAGS)) {
- 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);
+ /* 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 if (!strcmp(line.key, "logging")) {
+ if (!logger_name)
+ logger_name = line.value;
+ } else {
+ /* Don't need this line's contents */
+ free(line.value);
+ }
}
- value = NULL;
+ free(line.key);
}
-
- 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");
+ parse_config_file_end();
out:
- regfree(&re_ignore);
- regfree(&re_config1);
- regfree(&re_config2);
-out_nore:
fclose(fp);
out_noopen:
+ log_config(logger_name);
update_default_browser(&ctx, default_browser);
+
+ log_msg("continuous_mode: %d\n", ctx.continuous_mode);
+ log_msg("default_browser: '%s'\n",
+ default_browser?default_browser:"NULL");
+ log_msg("other_browser_cmd: '%s'\n",
+ ctx.other_browser_cmd?ctx.other_browser_cmd:"NULL");
+ log_msg("logging: '%s'\n",
+ logger_name?logger_name:"NULL");
+
+ free(logger_name);
free(default_browser);
return;
}
OssoBrowser *obj_osso_browser, *obj_osso_browser_req;
GMainLoop *mainloop;
GError *error = NULL;
+ int reqname_result;
read_config(0);
/* 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;
}
}
/* 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;
}
G_OBJECT(obj_osso_browser_req));
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;
}
projects / browser-switch / blobdiff