- /* 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);
+/* Callbacks for polling the event pipe in the GLib event loop */
+static GPollFD fdevents_pfd;
+/* Called before entering the poll() */
+static gboolean fdevents_prepare(GSource *source, gint *timeout) {
+ /* No timeout for poll() */
+ *timeout = -1;
+ return FALSE;
+}
+/* Check to see whether a handled event has happened */
+static gboolean fdevents_check(GSource *source) {
+ return !!(fdevents_pfd.revents & G_IO_IN);
+}
+/* Read the event from the pipe and handle it */
+static gboolean fdevents_dispatch(GSource *source,
+ GSourceFunc callback, gpointer user_data) {
+ int eventnum;
+
+ if (read(eventpipe[0], &eventnum, sizeof eventnum) == (sizeof eventnum)) {
+ /* Handle the event passed to us */
+ switch (eventnum) {
+ /* SIGHUP received -- reread config file */
+ case SIGHUP:
+ read_config();
+ break;
+ default:
+ return FALSE;