From: Steven Luo <steven+maemo@steven676.net>
Date: Tue, 15 Dec 2009 06:14:27 +0000 (-0800)
Subject: Try legacy config file location if config file not found
X-Git-Tag: v3.0rc1~19
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=440aa502fa0b307aaba049e1b0f49a40f7345b63

Try legacy config file location if config file not found

Before we renamed the project, the config file used to be found in
$HOME/.config/browser-proxy, so if we don't find a config file in the
new place, try the old one before giving up.
---

diff --git a/main.c b/main.c
index 73ca570..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))