#include <stdint.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
#include "sigrok-cli.h"
char **parse_probestring(int max_probes, const char *probestring)
return probelist;
}
-GHashTable *parse_generic_arg(const char *arg)
+GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
{
GHashTable *hash;
int i;
if (!arg || !arg[0])
return NULL;
- hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+ i = 0;
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, g_free);
elements = g_strsplit(arg, ":", 0);
- g_hash_table_insert(hash, g_strdup("sigrok_key"), g_strdup(elements[0]));
- for (i = 1; elements[i]; i++) {
+ if (sep_first)
+ g_hash_table_insert(hash, g_strdup("sigrok_key"),
+ g_strdup(elements[i++]));
+ for (; elements[i]; i++) {
e = strchr(elements[i], '=');
if (!e)
g_hash_table_insert(hash, g_strdup(elements[i]), NULL);
return dev;
}
+
+char *strcanon(const char *str)
+{
+ int p0, p1;
+ char *s;
+
+ /* Returns newly allocated string. */
+ s = g_ascii_strdown(str, -1);
+ for (p0 = p1 = 0; str[p0]; p0++) {
+ if ((s[p0] >= 'a' && s[p0] <= 'z')
+ || (s[p0] >= '0' && s[p0] <= '9'))
+ s[p1++] = s[p0];
+ }
+ s[p1] = '\0';
+
+ return s;
+}
+
+int canon_cmp(const char *str1, const char *str2)
+{
+ int ret;
+ char *s1, *s2;
+
+ s1 = strcanon(str1);
+ s2 = strcanon(str2);
+ ret = g_ascii_strcasecmp(s1, s2);
+ g_free(s2);
+ g_free(s1);
+
+ return ret;
+}