Don't expose libsigrokdecode's interal GSList.

[libsigrokdecode.git] / decode.c

diff --git a/decode.c b/decode.c
index a7458731b4288a3bddf73fe77184923c26d212b4..7125d32f44f9b63c6709d4ebe0fd5508814f14ce 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -21,6 +21,7 @@
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <stdio.h>
 #include <string.h>
+#include <dirent.h>
 
 /* Re-define some string functions for Python >= 3.0. */
 #if PY_VERSION_HEX >= 0x03000000
@@ -29,6 +30,9 @@
 #define PyString_Check PyBytes_Check
 #endif
 
+/* The list of protocol decoders. */
+GSList *list_pds = NULL;
+
 /**
  * Initialize libsigrokdecode.
  *
@@ -36,6 +40,10 @@
  */
 int sigrokdecode_init(void)
 {
+       DIR *dir;
+       struct dirent *dp;
+       char *tmp;
+
        /* Py_Initialize() returns void and usually cannot fail. */
        Py_Initialize();
 
@@ -44,14 +52,36 @@ int sigrokdecode_init(void)
        /* FIXME: What happens if this function is called multiple times? */
        PyRun_SimpleString(
                "import sys;"
-               "sys.path.append('libsigrokdecode/scripts');"
-               "sys.path.append('../libsigrokdecode/scripts');"
-               "sys.path.append('/usr/local/share/sigrok');"
+               "sys.path.append('libsigrokdecode/decoders');"
+               "sys.path.append('" DECODERS_DIR "');"
                );
 
+       if (!(dir = opendir(DECODERS_DIR)))
+               return SIGROKDECODE_ERR_DECODERS_DIR;
+
+       while ((dp = readdir(dir)) != NULL) {
+               if (!strstr(dp->d_name, ".py"))
+                       continue;
+               if ((tmp = strdup(dp->d_name)))
+                       list_pds = g_slist_append(list_pds, tmp);
+       }
+       closedir(dir);
+
        return SIGROKDECODE_OK;
 }
 
+/**
+ * Returns the list of supported/loaded protocol decoders.
+ *
+ * This is a GSList containing the names of the decoders as strings.
+ *
+ * @return List of decoders, NULL if none are supported or loaded.
+ */
+GSList *sigrokdecode_list_decoders(void)
+{
+       return list_pds;
+}
+
 /**
  * Helper function to handle Python strings.
  *