X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=srd.c;h=7b18c9a4dfa2a6ded230005f452a611f0094c4bb;hb=0f274b53a9c0c8a40cdb0ed41023705d99bc6c6c;hp=f5b885fecc8008ffdab72b81c92407e878a7058c;hpb=4467372a2e39bb72648eebbb96934147681110c2;p=libsigrokdecode.git
diff --git a/srd.c b/srd.c
index f5b885f..7b18c9a 100644
--- a/srd.c
+++ b/srd.c
@@ -18,9 +18,9 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
-#include "config.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include
/** @cond PRIVATE */
@@ -29,11 +29,8 @@
SRD_PRIV GSList *searchpaths = NULL;
/* session.c */
-extern GSList *sessions;
-extern int max_session_id;
-
-/* decoder.c */
-extern SRD_PRIV GSList *pd_list;
+extern SRD_PRIV GSList *sessions;
+extern SRD_PRIV int max_session_id;
/** @endcond */
@@ -65,7 +62,7 @@ extern SRD_PRIV GSList *pd_list;
*
* @section sec_mailinglists Mailing lists
*
- * There are two mailing lists for sigrok/libsigrokdecode: sigrok-devel and sigrok-commits.
+ * There is one mailing list for sigrok/libsigrokdecode: sigrok-devel.
*
* @section sec_irc IRC
*
@@ -98,6 +95,23 @@ extern SRD_PRIV GSList *pd_list;
* @{
*/
+static int searchpath_add_xdg_dir(const char *datadir)
+{
+ char *decdir;
+ int ret;
+
+ decdir = g_build_filename(datadir, PACKAGE_TARNAME, "decoders", NULL);
+
+ 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 */
+
+ g_free(decdir);
+
+ return ret;
+}
+
/**
* Initialize libsigrokdecode.
*
@@ -127,8 +141,10 @@ extern SRD_PRIV GSList *pd_list;
*/
SRD_API int srd_init(const char *path)
{
+ const char *const *sys_datadirs;
+ const char *env_path;
+ size_t i;
int ret;
- char *env_path;
if (max_session_id != -1) {
srd_err("libsigrokdecode is already initialized.");
@@ -143,11 +159,28 @@ SRD_API int srd_init(const char *path)
/* Initialize the Python interpreter. */
Py_Initialize();
- /* Installed decoders. */
+ /* 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]);
+ if (ret != SRD_OK) {
+ Py_Finalize();
+ return ret;
+ }
+ }
+#ifdef DECODERS_DIR
+ /* Hardcoded decoders install location, if defined. */
if ((ret = srd_decoder_searchpath_add(DECODERS_DIR)) != SRD_OK) {
Py_Finalize();
return ret;
}
+#endif
+ /* Location relative to the XDG user data directory. */
+ ret = searchpath_add_xdg_dir(g_get_user_data_dir());
+ if (ret != SRD_OK) {
+ Py_Finalize();
+ return ret;
+ }
/* Path specified by the user. */
if (path) {
@@ -158,7 +191,7 @@ SRD_API int srd_init(const char *path)
}
/* Environment variable overrides everything, for debugging. */
- if ((env_path = getenv("SIGROKDECODE_DIR"))) {
+ if ((env_path = g_getenv("SIGROKDECODE_DIR"))) {
if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK) {
Py_Finalize();
return ret;
@@ -227,51 +260,28 @@ SRD_API int srd_exit(void)
SRD_PRIV int srd_decoder_searchpath_add(const char *path)
{
PyObject *py_cur_path, *py_item;
- GString *new_path;
- int wc_len, i;
- wchar_t *wc_new_path;
- char *item;
srd_dbg("Adding '%s' to module path.", path);
- new_path = g_string_sized_new(256);
- g_string_assign(new_path, path);
py_cur_path = PySys_GetObject("path");
- for (i = 0; i < PyList_Size(py_cur_path); i++) {
- g_string_append(new_path, G_SEARCHPATH_SEPARATOR_S);
- py_item = PyList_GetItem(py_cur_path, i);
- if (!PyUnicode_Check(py_item))
- /* Shouldn't happen. */
- continue;
- if (py_str_as_str(py_item, &item) != SRD_OK)
- continue;
- g_string_append(new_path, item);
- g_free(item);
- }
+ if (!py_cur_path)
+ return SRD_ERR_PYTHON;
- /* Convert to wide chars. */
- wc_len = sizeof(wchar_t) * (new_path->len + 1);
- if (!(wc_new_path = g_try_malloc(wc_len))) {
- srd_dbg("malloc failed");
- return SRD_ERR_MALLOC;
+ py_item = PyUnicode_FromString(path);
+ if (!py_item) {
+ srd_exception_catch("Failed to create Unicode object");
+ return SRD_ERR_PYTHON;
}
- mbstowcs(wc_new_path, new_path->str, wc_len);
- PySys_SetPath(wc_new_path);
- g_string_free(new_path, TRUE);
- g_free(wc_new_path);
- searchpaths = g_slist_append(searchpaths, g_strdup(path));
+ if (PyList_Insert(py_cur_path, 0, py_item) < 0) {
+ srd_exception_catch("Failed to insert path element");
+ Py_DECREF(py_item);
+ return SRD_ERR_PYTHON;
+ }
+ Py_DECREF(py_item);
- return SRD_OK;
-}
+ searchpaths = g_slist_prepend(searchpaths, g_strdup(path));
-/* @private */
-SRD_PRIV gboolean srd_check_init(void)
-{
- if (max_session_id < 0) {
- srd_err("Library is not initialized.");
- return FALSE;
- } else
- return TRUE;
+ return SRD_OK;
}
/** @} */