valgrind: Clear more unfreed memory issues

[sigrok-cli.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index d6642b351e47372e705bfa883f84d45a6079a3c3..5ec655f78ad3dce8a05f01186a2a7ec61febb437 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -1,5 +1,5 @@
 /*
 /*

- * This file is part of the sigrok project.
+ * This file is part of the sigrok-cli project.

  *
  * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
  *
  *
  * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
  *


@@ -17,88 +17,257 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

+#include <config.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>

-#include <sigrok.h>

 #include "sigrok-cli.h"
 
 #include "sigrok-cli.h"
 

-char **parse_probestring(int max_probes, const char *probestring)
+struct sr_channel *find_channel(GSList *channellist, const char *channelname)

 {
 {

-       int tmp, b, e, i;
-       char **tokens, **range, **probelist, *name, str[8];
-       gboolean error;
+       struct sr_channel *ch;
+       GSList *l;

 
 

-       error = FALSE;
-       range = NULL;
-       if (!(probelist = g_try_malloc0(max_probes * sizeof(char *)))) {
-               /* TODO: Handle errors. */
+       ch = NULL;
+       for (l = channellist; l; l = l->next) {
+               ch = l->data;
+               if (!strcmp(ch->name, channelname))
+                       break;

        }
        }

-       tokens = g_strsplit(probestring, ",", max_probes);
+       ch = l ? l->data : NULL;
+
+       return ch;
+}
+
+GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
+{
+       struct sr_channel *ch;
+       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(channels);
+
+       ret = SR_OK;
+       range = NULL;
+       names = NULL;
+       channellist = NULL;
+       tokens = g_strsplit(channelstring, ",", 0);

        for (i = 0; tokens[i]; i++) {
        for (i = 0; tokens[i]; i++) {

+               if (tokens[i][0] == '\0') {
+                       g_critical("Invalid empty channel.");
+                       ret = SR_ERR;
+                       break;
+               }

                if (strchr(tokens[i], '-')) {
                if (strchr(tokens[i], '-')) {

-                       /* A range of probes in the form 1-5. */
+                       /*
+                        * 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.
+                        */

                        range = g_strsplit(tokens[i], "-", 2);
                        if (!range[0] || !range[1] || range[2]) {
                                /* Need exactly two arguments. */
                        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]);
-                               error = TRUE;
-                               break;
+                               g_critical("Invalid channel syntax '%s'.", tokens[i]);
+                               ret = SR_ERR;
+                               goto range_fail;

                        }
 
                        }
 

-                       b = strtol(range[0], NULL, 10);
+                       b = strtol(range[0], &eptr, 10);
+                       if (eptr == range[0] || *eptr != '\0') {
+                               g_critical("Invalid channel '%s'.", range[0]);
+                               ret = SR_ERR;
+                               goto range_fail;
+                       }

                        e = strtol(range[1], NULL, 10);
                        e = strtol(range[1], NULL, 10);

-                       if (b < 1 || e > max_probes || b >= e) {
-                               printf("Invalid probe range '%s'.\n",
-                                      tokens[i]);
-                               error = TRUE;
-                               break;
+                       if (eptr == range[1] || *eptr != '\0') {
+                               g_critical("Invalid channel '%s'.", range[1]);
+                               ret = SR_ERR;
+                               goto range_fail;
+                       }
+                       if (b < 0 || b >= e) {
+                               g_critical("Invalid channel range '%s'.", tokens[i]);
+                               ret = SR_ERR;
+                               goto range_fail;

                        }
 
                        while (b <= e) {
                        }
 
                        while (b <= e) {

-                               snprintf(str, 7, "%d", b);
-                               probelist[b - 1] = g_strdup(str);
+                               n = snprintf(str, 8, "%d", b);
+                               if (n < 0 || n > 8) {
+                                       g_critical("Invalid channel '%d'.", b);
+                                       ret = SR_ERR;
+                                       break;
+                               }
+                               ch = find_channel(channels, str);
+                               if (!ch) {
+                                       g_critical("unknown channel '%d'.", b);
+                                       ret = SR_ERR;
+                                       break;
+                               }
+                               channellist = g_slist_append(channellist, ch);

                                b++;
                        }
                                b++;
                        }

+range_fail:
+                       if (range)
+                               g_strfreev(range);
+
+                       if (ret != SR_OK)
+                               break;

                } else {
                } else {

-                       tmp = strtol(tokens[i], NULL, 10);
-                       if (tmp < 1 || tmp > max_probes) {
-                               printf("Invalid probe %d.\n", tmp);
-                               error = TRUE;
+                       names = g_strsplit(tokens[i], "=", 2);
+                       if (!names[0] || (names[1] && names[2])) {
+                               /* Need one or two arguments. */
+                               g_critical("Invalid channel '%s'.", tokens[i]);
+                               g_strfreev(names);
+                               ret = SR_ERR;

                                break;
                        }
 
                                break;
                        }
 

-                       if ((name = strchr(tokens[i], '='))) {
-                               probelist[tmp - 1] = g_strdup(++name);
-                               if (strlen(probelist[tmp - 1]) > SR_MAX_PROBENAME_LEN)
-                                       probelist[tmp - 1][SR_MAX_PROBENAME_LEN] = 0;
-                       } else {
-                               snprintf(str, 7, "%d", tmp);
-                               probelist[tmp - 1] = g_strdup(str);
+                       ch = find_channel(channels, names[0]);
+                       if (!ch) {
+                               g_critical("unknown channel '%s'.", names[0]);
+                               g_strfreev(names);
+                               ret = SR_ERR;
+                               break;
+                       }
+                       if (names[1]) {
+                               /* Rename channel. */
+                               g_free(ch->name);
+                               ch->name = g_strdup(names[1]);

                        }
                        }

+                       channellist = g_slist_append(channellist, ch);
+
+                       g_strfreev(names);

                }
        }
 
                }
        }
 

-       if (error) {
-               for (i = 0; i < max_probes; i++)
-                       if (probelist[i])
-                               g_free(probelist[i]);
-               g_free(probelist);
-               probelist = NULL;
+       if (ret != SR_OK) {
+               g_slist_free(channellist);
+               channellist = NULL;
+       }
+
+       g_strfreev(tokens);
+
+       return channellist;
+}
+
+int parse_trigger_match(char c)
+{
+       int match;
+
+       if (c == '0')
+               match = SR_TRIGGER_ZERO;
+       else if (c == '1')
+               match = SR_TRIGGER_ONE;
+       else if (c == 'r')
+               match = SR_TRIGGER_RISING;
+       else if (c == 'f')
+               match = SR_TRIGGER_FALLING;
+       else if (c == 'e')
+               match = SR_TRIGGER_EDGE;
+       else if (c == 'o')
+               match = SR_TRIGGER_OVER;
+       else if (c == 'u')
+               match = SR_TRIGGER_UNDER;
+       else
+               match = 0;
+
+       return match;
+}
+
+int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
+               struct sr_trigger **trigger)
+{
+       struct sr_channel *ch;
+       struct sr_trigger_stage *stage;
+       GVariant *gvar;
+       GSList *l, *channels;
+       gsize num_matches;
+       gboolean found_match, error;
+       const int32_t *matches;
+       int32_t match;
+       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 (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);
+       error = FALSE;
+       tokens = g_strsplit(s, ",", -1);
+       for (i = 0; tokens[i]; i++) {
+               if (!(sep = strchr(tokens[i], '='))) {
+                       g_critical("Invalid trigger '%s'.", tokens[i]);
+                       error = TRUE;
+                       break;
+               }
+               *sep++ = 0;
+               ch = NULL;
+               for (l = channels; l; l = l->next) {
+                       ch = l->data;
+                       if (ch->enabled && !strcmp(ch->name, tokens[i]))
+                               break;
+                       ch = NULL;
+               }
+               if (!ch) {
+                       g_critical("Invalid channel '%s'.", tokens[i]);
+                       error = TRUE;
+                       break;
+               }
+               for (t = 0; sep[t]; t++) {
+                       if (!(match = parse_trigger_match(sep[t]))) {
+                               g_critical("Invalid trigger match '%c'.", sep[t]);
+                               error = TRUE;
+                               break;
+                       }
+                       found_match = FALSE;
+                       for (j = 0; j < num_matches; j++) {
+                               if (matches[j] == match) {
+                                       found_match = TRUE;
+                                       break;
+                               }
+                       }
+                       if (!found_match) {
+                               g_critical("Trigger match '%c' not supported by device.", sep[t]);
+                               error = TRUE;
+                               break;
+                       }
+                       /* 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_add(*trigger);
+                       if (sr_trigger_match_add(stage, ch, match, 0) != SR_OK) {
+                               error = TRUE;
+                               break;
+                       }
+               }
+       }

        g_strfreev(tokens);
        g_strfreev(tokens);

-       if (range)
-               g_strfreev(range);
+       g_variant_unref(gvar);

 
 

-       return probelist;
+       if (error)
+               sr_trigger_free(*trigger);
+
+       return !error;

 }
 
 }
 

-GHashTable *parse_generic_arg(const char *arg)
+GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)

 {
        GHashTable *hash;
        int i;
 {
        GHashTable *hash;
        int i;


@@ -107,10 +276,14 @@ GHashTable *parse_generic_arg(const char *arg)
        if (!arg || !arg[0])
                return NULL;
 
        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);
        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);
                e = strchr(elements[i], '=');
                if (!e)
                        g_hash_table_insert(hash, g_strdup(elements[i]), NULL);


@@ -124,63 +297,157 @@ GHashTable *parse_generic_arg(const char *arg)
        return hash;
 }
 
        return hash;
 }
 

-struct sr_device *parse_devicestring(const char *devicestring)
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)

 {
 {

-       struct sr_device *device, *d;
-       struct sr_device_plugin *plugin;
-       GSList *devices, *plugins, *l, *p;
-       int num_devices, device_num, device_cnt;
-       char *tmp;
+       GHashTable *hash;
+       GVariant *gvar;
+       int i;
+       char *s;
+       gboolean b;

 
 

-       if (!devicestring)
-               return NULL;
+       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);
+                       }

 
 

-       device = NULL;
-       device_num = strtol(devicestring, &tmp, 10);
-       if (tmp != devicestring) {
-               /* argument is numeric, meaning a device ID. Make all driver
-                * plugins scan for devices.
-                */
-               num_devices = num_real_devices();
-               if (device_num < 0 || device_num >= num_devices)
+                       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;
+       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;
+}
+
+/* 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;
                        return NULL;

+               opts = g_slist_append(opts, src);
+       }
+       g_list_free(keys);

 
 

-               device_cnt = 0;
-               devices = sr_dev_list();
-               for (l = devices; l; l = l->next) {
-                       d = l->data;
-                       if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEVICE))
-                               continue;
-                       if (device_cnt == device_num) {
-                               if (device_num == device_cnt) {
-                                       device = d;
-                                       break;
-                               }
-                       }
-                       device_cnt++;
-               }
-       } else {
-               /* select device by driver -- only initialize that driver,
-                * no need to let them all scan
-                */
-               device = NULL;
-               plugins = sr_list_hwplugins();
-               for (p = plugins; p; p = p->next) {
-                       plugin = p->data;
-                       if (strcmp(plugin->name, devicestring))
-                               continue;
-                       num_devices = sr_init_hwplugin(plugin);
-                       if (num_devices == 1) {
-                               devices = sr_dev_list();
-                               device = devices->data;
-                       } else if (num_devices > 1) {
-                               printf("driver '%s' found %d devices, select by ID instead.\n",
-                                               devicestring, num_devices);
+       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;

                        }
                        }

-                       /* fall through: selected driver found no devices */
-                       break;

                }
        }
 
                }
        }
 

-       return device;
+       g_hash_table_destroy(drvargs);
+
+       return TRUE;

 }
 }