X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=f3c1446f9ac40a952180fad8415369965fb33b57;hp=d79c607d550f0c3356ee23147c74cfbf56c77746;hb=9d9fcb375d7702082146bf917a5d19cc83480eae;hpb=2086c68463fef416fd9a48dac5e1aa7fa593308d

diff --git a/controller.c b/controller.c
index d79c607..f3c1446 100644
--- a/controller.c
+++ b/controller.c
@@ -118,10 +118,19 @@ int srd_exit(void)
 
 
 /**
- * Add search directories for the protocol decoders.
+ * Add an additional search directory for the protocol decoders.
+ *
+ * The specified directory is prepended (not appended!) to Python's sys.path,
+ * in order to search for sigrok protocol decoders in the specified
+ * directories first, and in the generic Python module directories (and in
+ * the current working directory) last. This avoids conflicts if there are
+ * Python modules which have the same name as a sigrok protocol decoder in
+ * sys.path or in the current working directory.
  *
  * TODO: add path from env var SIGROKDECODE_PATH, config etc
  * TODO: Should take directoryname/path as input.
+ *
+ * @return TODO.
  */
 int set_modulepath(void)
 {
@@ -143,9 +152,8 @@ int set_modulepath(void)
 	path = g_strdup(DECODERS_DIR);
 #endif
 
-	/* TODO: Prepend instead of appending. */
 	/* TODO: Sanity check on 'path' (length, escape special chars, ...). */
-	s = g_strdup_printf("import sys; sys.path.append(r'%s')", path);
+	s = g_strdup_printf("import sys; sys.path.insert(0, r'%s')", path);
 
 	ret = PyRun_SimpleString(s);
 
@@ -296,7 +304,7 @@ int srd_instance_set_probes(struct srd_decoder_instance *di,
 	GSList *sl;
 	struct srd_probe *p;
 	int *new_probemap, new_probenum;
-	char *probe_id;
+	char *probe_id, *probenum_str;
 
 	if (g_hash_table_size(new_probes) == 0)
 		/* No probes provided. */
@@ -318,7 +326,14 @@ int srd_instance_set_probes(struct srd_decoder_instance *di,
 
 	for (l = g_hash_table_get_keys(new_probes); l; l = l->next) {
 		probe_id = l->data;
-		new_probenum = strtol(g_hash_table_lookup(new_probes, probe_id), NULL, 10);
+		probenum_str = g_hash_table_lookup(new_probes, probe_id);
+		if (!probenum_str) {
+			/* Probe name was specified without a value. */
+			srd_err("No probe number was specified for %s.", probe_id);
+			g_free(new_probemap);
+			return SRD_ERR_ARG;
+		}
+		new_probenum = strtol(probenum_str, NULL, 10);
 		if (!(sl = g_slist_find_custom(di->decoder->probes, probe_id,
 				(GCompareFunc)compare_probe_id))) {
 			/* Fall back on optional probes. */