cli: more flexible generic arg parser

[sigrok-cli.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index fca926f3d321e5145dc00cffd9b8db1d5bce5bbf..65a265389f2d0dba79772b8e3cc3e19810bf12cf 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -22,7 +22,7 @@
 #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)
@@ -44,8 +44,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                        range = g_strsplit(tokens[i], "-", 2);
                        if (!range[0] || !range[1] || range[2]) {
                                /* Need exactly two arguments. */
-                               printf("Invalid probe syntax '%s'.\n",
-                                      tokens[i]);
+                               g_critical("Invalid probe syntax '%s'.", tokens[i]);
                                error = TRUE;
                                break;
                        }
@@ -53,8 +52,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                        b = strtol(range[0], NULL, 10);
                        e = strtol(range[1], NULL, 10);
                        if (b < 1 || e > max_probes || b >= e) {
-                               printf("Invalid probe range '%s'.\n",
-                                      tokens[i]);
+                               g_critical("Invalid probe range '%s'.", tokens[i]);
                                error = TRUE;
                                break;
                        }
@@ -67,7 +65,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                } else {
                        tmp = strtol(tokens[i], NULL, 10);
                        if (tmp < 1 || tmp > max_probes) {
-                               printf("Invalid probe %d.\n", tmp);
+                               g_critical("Invalid probe %d.", tmp);
                                error = TRUE;
                                break;
                        }
@@ -98,7 +96,7 @@ 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;
@@ -107,10 +105,14 @@ GHashTable *parse_generic_arg(const char *arg)
        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);
@@ -183,3 +185,34 @@ struct sr_dev *parse_devstring(const char *devstring)
 
        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;
+}