sigrokdecode_init: Add more Python search paths.

[libsigrokdecode.git] / decode.c

diff --git a/decode.c b/decode.c
index 7bbcff336bf8badf353a392d258a8fc7e1a8bb23..ab412f6860b3ba545c68c2b4890757a0c20c1df4 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -31,8 +31,14 @@ int sigrokdecode_init(void)
        /* Py_Initialize() returns void and usually cannot fail. */
        Py_Initialize();
 
-       /* FIXME */
-       PySys_SetPath("libsigrokdecode/scripts");
+       /* Add some more search directories for convenience. */
+       /* FIXME: Check error code. */
+       PyRun_SimpleString(
+               "import sys;"
+               "sys.path.append('libsigrokdecode/scripts');"
+               "sys.path.append('../libsigrokdecode/scripts');"
+               "sys.path.append('/usr/local/share/sigrok');"
+               );
 
        return 0;
 }
@@ -45,6 +51,9 @@ int sigrokdecode_init(void)
  */
 int sigrokdecode_load_decoder_file(const char *name)
 {
+       /* QUICK HACK */
+       name = name;
+
        /* TODO */
        return 0;
 }
@@ -64,6 +73,7 @@ int sigrokdecode_run_decoder(const char *decodername, uint8_t *inbuf,
                             uint64_t *outbuflen)
 {
        const char *decoder_filename = "transitioncounter"; /* FIXME */
+       // const char *decoder_filename = "i2c"; /* FIXME */
        PyObject *py_name, *py_module, *py_func, *py_args;
        PyObject *py_value, *py_result;
        int ret;