From d42ba93959263cd5fc38ec548ee4007de1b072bc Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Fri, 20 Jan 2017 18:27:10 +0000
Subject: [PATCH] Don't use the HOME directory as the espeak-ng-data path.

---
 src/libespeak-ng/speech.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index e3c0f65f..4dda6764 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -218,7 +218,7 @@ int sync_espeak_terminated_msg(uint32_t unique_identifier, void *user_data)
 
 #endif
 
-static int check_data_path(const char *path)
+static int check_data_path(const char *path, int allow_directory)
 {
 	if (!path) return 0;
 
@@ -226,6 +226,9 @@ static int check_data_path(const char *path)
 	if (GetFileLength(path_home) == -2)
 		return 1;
 
+	if (!allow_directory)
+		return 0;
+
 	snprintf(path_home, sizeof(path_home), "%s", path);
 	return GetFileLength(path_home) == -2;
 }
@@ -279,7 +282,7 @@ int GetFileLength(const char *filename)
 
 ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
 {
-	if (check_data_path(path))
+	if (check_data_path(path, 1))
 		return;
 
 #ifdef PLATFORM_WINDOWS
@@ -288,7 +291,7 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
 	unsigned long var_type;
 	unsigned char buf[sizeof(path_home)-13];
 
-	if (check_data_path(getenv("ESPEAK_DATA_PATH")))
+	if (check_data_path(getenv("ESPEAK_DATA_PATH"), 1))
 		return;
 
 	buf[0] = 0;
@@ -299,13 +302,13 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
 	var_type = REG_SZ;
 	RegQueryValueExA(RegKey, "Path", 0, &var_type, buf, &size);
 
-	if (check_data_path(buf))
+	if (check_data_path(buf, 1))
 		return;
 #elif !defined(PLATFORM_DOS)
-	if (check_data_path(getenv("ESPEAK_DATA_PATH")))
+	if (check_data_path(getenv("ESPEAK_DATA_PATH"), 1))
 		return;
 
-	if (check_data_path(getenv("HOME")))
+	if (check_data_path(getenv("HOME"), 0))
 		return;
 #endif