valgrind: Clear more unfreed memory issues
[sigrok-cli.git] / parsers.c
index 63a5acd424715b0d313827e9b6d622b7dd7429e2..5ec655f78ad3dce8a05f01186a2a7ec61febb437 100644 (file)
--- a/parsers.c
+++ b/parsers.c
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 struct sr_channel *find_channel(GSList *channellist, const char *channelname)
 {
@@ -43,13 +44,15 @@ struct sr_channel *find_channel(GSList *channellist, const char *channelname)
 GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
 {
        struct sr_channel *ch;
-       GSList *channellist;
+       GSList *channellist, *channels;
        int ret, n, b, e, i;
        char **tokens, **range, **names, *eptr, str[8];
 
+       channels = sr_dev_inst_channels_get(sdi);
+
        if (!channelstring || !channelstring[0])
                /* Use all channels by default. */
-               return g_slist_copy(sdi->channels);
+               return g_slist_copy(channels);
 
        ret = SR_OK;
        range = NULL;
@@ -63,10 +66,12 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
                        break;
                }
                if (strchr(tokens[i], '-')) {
-                       /* A range of channels in the form a-b. This will only work
+                       /*
+                        * A range of channels in the form a-b. This will only work
                         * if the channels are named as numbers -- so every channel
                         * in the range must exist as a channel name string in the
-                        * device. */
+                        * device.
+                        */
                        range = g_strsplit(tokens[i], "-", 2);
                        if (!range[0] || !range[1] || range[2]) {
                                /* Need exactly two arguments. */
@@ -100,7 +105,7 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
                                        ret = SR_ERR;
                                        break;
                                }
-                               ch = find_channel(sdi->channels, str);
+                               ch = find_channel(channels, str);
                                if (!ch) {
                                        g_critical("unknown channel '%d'.", b);
                                        ret = SR_ERR;
@@ -125,7 +130,7 @@ range_fail:
                                break;
                        }
 
-                       ch = find_channel(sdi->channels, names[0]);
+                       ch = find_channel(channels, names[0]);
                        if (!ch) {
                                g_critical("unknown channel '%s'.", names[0]);
                                g_strfreev(names);
@@ -177,13 +182,13 @@ int parse_trigger_match(char c)
        return match;
 }
 
-int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
+int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
+               struct sr_trigger **trigger)
 {
        struct sr_channel *ch;
-       struct sr_trigger *trigger;
        struct sr_trigger_stage *stage;
        GVariant *gvar;
-       GSList *l;
+       GSList *l, *channels;
        gsize num_matches;
        gboolean found_match, error;
        const int32_t *matches;
@@ -191,15 +196,19 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
        unsigned int j;
        int t, i;
        char **tokens, *sep;
+       struct sr_dev_driver *driver;
+
+       driver = sr_dev_inst_driver_get(sdi);
+       channels = sr_dev_inst_channels_get(sdi);
 
-       if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
+       if (maybe_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
                        &gvar) != SR_OK) {
                g_critical("Device doesn't support any triggers.");
                return FALSE;
        }
        matches = g_variant_get_fixed_array(gvar, &num_matches, sizeof(int32_t));
 
-       trigger = sr_trigger_new(NULL);
+       *trigger = sr_trigger_new(NULL);
        error = FALSE;
        tokens = g_strsplit(s, ",", -1);
        for (i = 0; tokens[i]; i++) {
@@ -210,7 +219,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
                }
                *sep++ = 0;
                ch = NULL;
-               for (l = sdi->channels; l; l = l->next) {
+               for (l = channels; l; l = l->next) {
                        ch = l->data;
                        if (ch->enabled && !strcmp(ch->name, tokens[i]))
                                break;
@@ -241,8 +250,8 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
                        }
                        /* Make sure this ends up in the right stage, creating
                         * them as needed. */
-                       while (!(stage = g_slist_nth_data(trigger->stages, t)))
-                               sr_trigger_stage_new(trigger);
+                       while (!(stage = g_slist_nth_data((*trigger)->stages, t)))
+                               sr_trigger_stage_add(*trigger);
                        if (sr_trigger_match_add(stage, ch, match, 0) != SR_OK) {
                                error = TRUE;
                                break;
@@ -253,9 +262,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s)
        g_variant_unref(gvar);
 
        if (error)
-               sr_trigger_free(trigger);
-       else
-               error = sr_session_trigger_set(trigger) != SR_OK;
+               sr_trigger_free(*trigger);
 
        return !error;
 }
@@ -290,6 +297,58 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
        return hash;
 }
 
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
+{
+       GHashTable *hash;
+       GVariant *gvar;
+       int i;
+       char *s;
+       gboolean b;
+
+       hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+                       (GDestroyNotify)g_variant_unref);
+       for (i = 0; opts[i]; i++) {
+               if (!(s = g_hash_table_lookup(genargs, opts[i]->id)))
+                       continue;
+               if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT32)) {
+                       gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_INT32)) {
+                       gvar = g_variant_new_int32(strtoul(s, NULL, 10));
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_UINT64)) {
+                       gvar = g_variant_new_uint64(strtoul(s, NULL, 10));
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_DOUBLE)) {
+                       gvar = g_variant_new_double(strtod(s, NULL));
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_STRING)) {
+                       gvar = g_variant_new_string(s);
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else if (g_variant_is_of_type(opts[i]->def, G_VARIANT_TYPE_BOOLEAN)) {
+                       b = TRUE;
+                       if (0 == strcmp(s, "false") || 0 == strcmp(s, "no")) {
+                               b = FALSE;
+                       } else if (!(0 == strcmp(s, "true") || 0 == strcmp(s, "yes"))) {
+                               g_critical("Unable to convert '%s' to boolean!", s);
+                       }
+
+                       gvar = g_variant_new_boolean(b);
+                       g_hash_table_insert(hash, g_strdup(opts[i]->id),
+                                       g_variant_ref_sink(gvar));
+               } else {
+                       g_critical("Don't know GVariant type for option '%s'!", opts[i]->id);
+                }
+       }
+
+       return hash;
+}
+
 static char *strcanon(const char *str)
 {
        int p0, p1;
@@ -320,3 +379,75 @@ int canon_cmp(const char *str1, const char *str2)
 
        return ret;
 }
+
+/* Convert driver options hash to GSList of struct sr_config. */
+static GSList *hash_to_hwopt(GHashTable *hash)
+{
+       struct sr_config *src;
+       GList *gl, *keys;
+       GSList *opts;
+       char *key;
+
+       keys = g_hash_table_get_keys(hash);
+       opts = NULL;
+       for (gl = keys; gl; gl = gl->next) {
+               key = gl->data;
+               src = g_malloc(sizeof(struct sr_config));
+               if (opt_to_gvar(key, g_hash_table_lookup(hash, key), src) != 0)
+                       return NULL;
+               opts = g_slist_append(opts, src);
+       }
+       g_list_free(keys);
+
+       return opts;
+}
+
+int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
+{
+       struct sr_dev_driver **drivers;
+       GHashTable *drvargs;
+       int i;
+       char *drvname;
+
+       if (!arg)
+               return FALSE;
+
+       drvargs = parse_generic_arg(arg, TRUE);
+
+       drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
+       g_hash_table_remove(drvargs, "sigrok_key");
+       *driver = NULL;
+       drivers = sr_driver_list(sr_ctx);
+       for (i = 0; drivers[i]; i++) {
+               if (strcmp(drivers[i]->name, drvname))
+                       continue;
+               *driver = drivers[i];
+       }
+       if (!*driver) {
+               g_critical("Driver %s not found.", drvname);
+               g_hash_table_destroy(drvargs);
+               g_free(drvname);
+               return FALSE;
+       }
+       g_free(drvname);
+       if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+               g_critical("Failed to initialize driver.");
+               g_hash_table_destroy(drvargs);
+               return FALSE;
+       }
+
+       if (drvopts) {
+               *drvopts = NULL;
+               if (g_hash_table_size(drvargs) > 0) {
+                       if (!(*drvopts = hash_to_hwopt(drvargs))) {
+                               /* Unknown options, already logged. */
+                               g_hash_table_destroy(drvargs);
+                               return FALSE;
+                       }
+               }
+       }
+
+       g_hash_table_destroy(drvargs);
+
+       return TRUE;
+}