libsigrokdecode fix to handle unusual dirnames.

[libsigrokdecode.git] / decode.c

diff --git a/decode.c b/decode.c
index 598b2ba50be0c81299340bbe089ffdcd7a283009..da8624a4a40f125784398c64da9ca7a9f1dd45b0 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -47,14 +47,11 @@ int sigrokdecode_init(void)
        /* Py_Initialize() returns void and usually cannot fail. */
        Py_Initialize();
 
-       /* Add some more search directories for convenience. */
+       /* Add search directory for the protocol decoders. */
        /* FIXME: Check error code. */
        /* FIXME: What happens if this function is called multiple times? */
-       PyRun_SimpleString(
-               "import sys;"
-               "sys.path.append('libsigrokdecode/decoders');"
-               "sys.path.append('" DECODERS_DIR "');"
-               );
+       PyRun_SimpleString("import sys;"
+                          "sys.path.append(r'" DECODERS_DIR "');");
 
        if (!(dir = opendir(DECODERS_DIR)))
                return SIGROKDECODE_ERR_DECODERS_DIR;
@@ -62,7 +59,8 @@ int sigrokdecode_init(void)
        while ((dp = readdir(dir)) != NULL) {
                if (!g_str_has_suffix(dp->d_name, ".py"))
                        continue;
-               if ((tmp = strdup(dp->d_name)))
+               /* For now use the filename (without .py) as decoder name. */
+               if ((tmp = g_strndup(dp->d_name, strlen(dp->d_name) - 3)))
                        list_pds = g_slist_append(list_pds, tmp);
        }
        closedir(dir);