X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=file.c;h=18193b2346514067d9e66457530b42af16678f1c;hp=b9bc7e2e404838b0b1129071de43416ed24d0d6a;hb=9f0bc6ef9620912ca42eca9c3f4b6ca10dba35ce;hpb=a2af96e68b210b7c3db90b7ec474498c5611a3a7

diff --git a/file.c b/file.c
index b9bc7e2..18193b2 100644
--- a/file.c
+++ b/file.c
@@ -31,7 +31,7 @@ char *g_score_file;
 mode_t g_score_mode;
 
 char *
-load_file(char *filename)
+add_path(char *filename)
 {
 	static char r[MAX_PATH_LEN];
 	snprintf(r, MAX_PATH_LEN, "%s/%s", g_data_dir, filename);
@@ -61,10 +61,11 @@ find_data_dir(void)
 	char *data_options[3] = {
 		"./data",
 		getenv("VOR_DATA"),
-		"/usr/share/vor"
+		DATA_PREFIX
 	};
 
 	for(i=0; i<3; i++) {
+		if(!data_options[i]) continue;
 		g_data_dir = strdup(data_options[i]);
 		if(is_dir(g_data_dir)) return true;
 	}
@@ -79,9 +80,12 @@ find_data_dir(void)
 int
 find_score_file(void)
 {
-	g_score_file = load_file("scores");
+	g_score_file = add_path("scores");
 	g_score_mode = 0111;
-	if(is_file(g_score_file)) return true;
+	if(is_file(g_score_file)) {
+		g_score_file = strdup(g_score_file);
+		return true;
+	}
 
 	g_score_file = malloc(MAX_PATH_LEN);
 	snprintf(g_score_file, MAX_PATH_LEN,