X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=main.c;h=66591c676fc84141d8a46596c5a0e6d613bb359e;hp=a366fe7524205e01a972506a683ba2b09a3ef7c9;hb=440aa502fa0b307aaba049e1b0f49a40f7345b63;hpb=8dde3166d0a99a74fc16f6afa4f5106167a9bab3

diff --git a/main.c b/main.c
index a366fe7..66591c6 100644
--- a/main.c
+++ b/main.c
@@ -36,6 +36,7 @@
 
 #define DEFAULT_HOMEDIR "/home/user"
 #define CONFIGFILE_LOC "/.config/browser-switchboard"
+#define CONFIGFILE_LOC_OLD "/.config/browser-proxy"
 #define MAXLINE 1024
 
 struct swb_context ctx;
@@ -73,8 +74,14 @@ static void read_config(int signalnum) {
 		goto out_noopen;
 	snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC);
 
-	if (!(fp = fopen(configfile, "r")))
-		goto out_noopen;
+	if (!(fp = fopen(configfile, "r"))) {
+		/* Try the legacy config file location before giving up
+		   XXX we assume here that CONFIGFILE_LOC_OLD is shorter
+		   than CONFIGFILE_LOC! */
+		snprintf(configfile, len, "%s%s", homedir, CONFIGFILE_LOC_OLD);
+		if (!(fp = fopen(configfile, "r")))
+			goto out_noopen;
+	}
 
 	/* compile regex matching blank lines or comments */
 	if (regcomp(&re_ignore, "^[[:space:]]*(#|$)", REG_EXTENDED|REG_NOSUB))
@@ -169,7 +176,7 @@ int main() {
 	if (ctx.continuous_mode) {
 		struct sigaction act;
 		act.sa_flags = SA_RESTART;
-		act.sa_mask = 0;
+		sigemptyset(&(act.sa_mask));
 
 		act.sa_handler = waitforzombies;
 		if (sigaction(SIGCHLD, &act, NULL) == -1) {