X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=35ec5f2e9b7761f8847d957affd0935b2ed39677;hp=bed803198c99bb339db52c5da93d9b399ef989b9;hb=HEAD;hpb=3481b5f753a103eaa2f0bbff90981bb79b3c5e88

diff --git a/srd.c b/srd.c
index bed8031..10dfaf6 100644
--- a/srd.c
+++ b/srd.c
@@ -67,8 +67,8 @@ extern SRD_PRIV int max_session_id;
  * @section sec_irc IRC
  *
  * You can find the sigrok developers in the
- * <a href="irc://chat.freenode.net/sigrok">\#sigrok</a>
- * IRC channel on Freenode.
+ * <a href="ircs://irc.libera.chat/#sigrok">\#sigrok</a>
+ * IRC channel on Libera.Chat.
  *
  * @section sec_website Website
  *
@@ -105,7 +105,7 @@ static int searchpath_add_xdg_dir(const char *datadir)
 	if (g_file_test(decdir, G_FILE_TEST_IS_DIR))
 		ret = srd_decoder_searchpath_add(decdir);
 	else
-		ret = SRD_OK; /* just ignore non-existing directory */
+		ret = SRD_OK; /* Just ignore non-existing directory. */
 
 	g_free(decdir);
 
@@ -172,6 +172,7 @@ static int print_searchpaths(void)
 		py_path = PyList_GetItem(py_paths, i);
 		py_bytes = PyUnicode_AsUTF8String(py_path);
 		g_string_append_printf(s, " - %s\n", PyBytes_AsString(py_bytes));
+		Py_DECREF(py_bytes);
 	}
 	s->str[s->len - 1] = '\0';
 	srd_dbg("%s", s->str);
@@ -188,11 +189,6 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
-SRD_API GSList *srd_searchpaths_get(void)
-{
-	return g_slist_copy_deep(searchpaths, (GCopyFunc)g_strdup, NULL);
-}
-
 /**
  * Initialize libsigrokdecode.
  *
@@ -245,7 +241,7 @@ SRD_API int srd_init(const char *path)
 	/* Locations relative to the XDG system data directories. */
 	sys_datadirs = g_get_system_data_dirs();
 	for (i = g_strv_length((char **)sys_datadirs); i > 0; i--) {
-		ret = searchpath_add_xdg_dir(sys_datadirs[i-1]);
+		ret = searchpath_add_xdg_dir(sys_datadirs[i - 1]);
 		if (ret != SRD_OK) {
 			Py_Finalize();
 			return ret;
@@ -274,15 +270,46 @@ SRD_API int srd_init(const char *path)
 	}
 
 	/* Environment variable overrides everything, for debugging. */
+	/*
+	 * TODO
+	 * Is the comment still applicable and correct or up to date?
+	 * This implementation adds paths which were specified by the
+	 * env var. Which can shadow files in other locations, or can
+	 * extend the set of available decoders. Which need not only
+	 * serve for development, it is as beneficial to regular users.
+	 * Without shadowing all other files still are found.
+	 */
 	if ((env_path = g_getenv("SIGROKDECODE_DIR"))) {
 		if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK) {
 			Py_Finalize();
 			return ret;
 		}
 	}
+	env_path = g_getenv("SIGROKDECODE_PATH");
+	if (env_path) {
+		char **dir_list, **dir_iter, *dir_item;
+		dir_list = g_strsplit(env_path, G_SEARCHPATH_SEPARATOR_S, 0);
+		for (dir_iter = dir_list; *dir_iter; dir_iter++) {
+			dir_item = *dir_iter;
+			if (!dir_item || !*dir_item)
+				continue;
+			ret = srd_decoder_searchpath_add(dir_item);
+			if (ret != SRD_OK) {
+				Py_Finalize();
+				return ret;
+			}
+		}
+		g_strfreev(dir_list);
+	}
 
-	/* Initialize the Python GIL (this also happens to acquire it). */
+#if PY_VERSION_HEX < 0x03090000
+	/*
+	 * Initialize and acquire the Python GIL. In Python 3.7+ this
+	 * will be done implicitly as part of the Py_InitializeEx()
+	 * call above. PyEval_InitThreads() was deprecated in 3.9.
+	 */
 	PyEval_InitThreads();
+#endif
 
 	/* Release the GIL (ignore return value, we don't need it here). */
 	(void)PyEval_SaveThread();
@@ -294,6 +321,12 @@ SRD_API int srd_init(const char *path)
 	return SRD_OK;
 }
 
+static void srd_session_destroy_cb(void *arg, void *ignored)
+{
+	(void)ignored; // Prevent unused warning
+	srd_session_destroy((struct srd_session *)arg);
+}
+
 /**
  * Shutdown libsigrokdecode.
  *
@@ -312,7 +345,9 @@ SRD_API int srd_exit(void)
 {
 	srd_dbg("Exiting libsigrokdecode.");
 
-	g_slist_foreach(sessions, (GFunc)srd_session_destroy, NULL);
+	g_slist_foreach(sessions, srd_session_destroy_cb, NULL);
+	g_slist_free(sessions);
+	sessions = NULL;
 
 	srd_decoder_unload_all();
 	g_slist_free_full(searchpaths, g_free);
@@ -351,8 +386,6 @@ SRD_API int srd_exit(void)
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *
  * @private
- *
- * @since 0.1.0
  */
 SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 {
@@ -391,4 +424,21 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
+/**
+ * Return the list of protocol decoder search paths.
+ *
+ * @return The list of search paths used when loading protocol decoders.
+ *
+ * @since 0.5.1
+ */
+SRD_API GSList *srd_searchpaths_get(void)
+{
+	GSList *paths = NULL;
+
+	for (GSList *l = searchpaths; l; l = l->next)
+		paths = g_slist_append(paths, g_strdup(l->data));
+
+	return paths;
+}
+
 /** @} */