From: Uwe Hermann <redacted>
Date: Wed, 18 Jan 2012 23:21:00 +0000 (+0100)
Subject: srd: Windows/MinGW Python path format fixes.
X-Git-Tag: libsigrokdecode-0.1.0~124
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=639c56898e88aae99a7b91a5c6d2b7870956d648;p=libsigrokdecode.git

srd: Windows/MinGW Python path format fixes.

On Windows/MinGW, Python's sys.path needs entries of the form
'C:\\foo\\bar' instead of '/foo/bar'.
---

diff --git a/controller.c b/controller.c
index 4fa729c..f5e272e 100644
--- a/controller.c
+++ b/controller.c
@@ -114,13 +114,36 @@ int srd_exit(void)
  * Add search directories for the protocol decoders.
  *
  * TODO: add path from env var SIGROKDECODE_PATH, config etc
+ * TODO: Should take directoryname/path as input.
  */
 int set_modulepath(void)
 {
 	int ret;
+	gchar *path, *s;
 
-	PyRun_SimpleString("import sys");
-	ret = PyRun_SimpleString("sys.path.append(r'" DECODERS_DIR "');");
+#ifdef _WIN32
+	gchar **splitted;
+
+	/*
+	 * On Windows/MinGW, Python's sys.path needs entries of the form
+	 * 'C:\\foo\\bar' instead of '/foo/bar'.
+	 */
+
+	splitted = g_strsplit(DECODERS_DIR, "/", 0);
+	path = g_build_pathv("\\\\", splitted);
+	g_strfreev(splitted);
+#else
+	path = g_strdup(DECODERS_DIR);
+#endif
+
+	/* TODO: Prepend instead of appending. */
+	/* TODO: Sanity check on 'path' (length, escape special chars, ...). */
+	s = g_strdup_printf("import sys; sys.path.append(r'%s')", path);
+
+	ret = PyRun_SimpleString(s);
+
+	g_free(path);
+	g_free(s);
 
 	return ret;
 }