X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=59b1f6823aaa1f52b9243642f2e49c550329de06;hp=659bbad88dfca9bf8f4248309829126b4fbb1de3;hb=9b0b39f6312c2ebbee92bd97076cffe63116c05e;hpb=60ea8937c54f5a8a36b4e4f91de03ff545e2bcd9 diff --git a/parsers.c b/parsers.c index 659bbad..59b1f68 100644 --- a/parsers.c +++ b/parsers.c @@ -25,78 +25,133 @@ #include #include "sigrok-cli.h" -char **parse_probestring(int max_probes, const char *probestring) +struct sr_probe *find_probe(GSList *probelist, const char *probename) { - int tmp, b, e, i; - char **tokens, **range, **probelist, *name, str[8]; - gboolean error; + struct sr_probe *probe; + GSList *l; - error = FALSE; - range = NULL; - if (!(probelist = g_try_malloc0(max_probes * sizeof(char *)))) { - /* TODO: Handle errors. */ + probe = NULL; + for (l = probelist; l; l = l->next) { + probe = l->data; + if (!strcmp(probe->name, probename)) + break; } - tokens = g_strsplit(probestring, ",", max_probes); + probe = l ? l->data : NULL; + + return probe; +} + +GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring) +{ + struct sr_probe *probe; + GSList *probelist; + int ret, n, b, e, i; + char **tokens, **range, **names, *eptr, str[8]; + if (!probestring || !probestring[0]) + /* All probes are enabled by default by the driver. */ + return NULL; + + ret = SR_OK; + range = NULL; + names = NULL; + probelist = NULL; + tokens = g_strsplit(probestring, ",", 0); for (i = 0; tokens[i]; i++) { + if (tokens[i][0] == '\0') { + g_critical("Invalid empty probe."); + ret = SR_ERR; + break; + } if (strchr(tokens[i], '-')) { - /* A range of probes in the form 1-5. */ + /* A range of probes in the form a-b. This will only work + * if the probes are named as numbers -- so every probe + * in the range must exist as a probe name string in the + * device. */ range = g_strsplit(tokens[i], "-", 2); if (!range[0] || !range[1] || range[2]) { /* Need exactly two arguments. */ g_critical("Invalid probe syntax '%s'.", tokens[i]); - error = TRUE; + ret = SR_ERR; break; } - b = strtol(range[0], NULL, 10); + b = strtol(range[0], &eptr, 10); + if (eptr == range[0] || *eptr != '\0') { + g_critical("Invalid probe '%s'.", range[0]); + ret = SR_ERR; + break; + } e = strtol(range[1], NULL, 10); - if (b < 1 || e > max_probes || b >= e) { + if (eptr == range[1] || *eptr != '\0') { + g_critical("Invalid probe '%s'.", range[1]); + ret = SR_ERR; + break; + } + if (b < 0 || b >= e) { g_critical("Invalid probe range '%s'.", tokens[i]); - error = TRUE; + ret = SR_ERR; break; } 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 probe '%d'.", b); + ret = SR_ERR; + break; + } + probe = find_probe(sdi->probes, str); + if (!probe) { + g_critical("unknown probe '%d'.", b); + ret = SR_ERR; + break; + } + probelist = g_slist_append(probelist, probe); b++; } + if (ret != SR_OK) + break; } else { - tmp = strtol(tokens[i], NULL, 10); - if (tmp < 1 || tmp > max_probes) { - g_critical("Invalid probe %d.", tmp); - error = TRUE; + names = g_strsplit(tokens[i], "=", 2); + if (!names[0] || (names[1] && names[2])) { + /* Need one or two arguments. */ + g_critical("Invalid probe '%s'.", tokens[i]); + ret = SR_ERR; 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); + probe = find_probe(sdi->probes, names[0]); + if (!probe) { + g_critical("unknown probe '%s'.", names[0]); + ret = SR_ERR; + break; } + if (names[1]) { + /* Rename probe. */ + g_free(probe->name); + probe->name = g_strdup(names[1]); + } + probelist = g_slist_append(probelist, probe); } } + if (range) + g_strfreev(range); - if (error) { - for (i = 0; i < max_probes; i++) - if (probelist[i]) - g_free(probelist[i]); - g_free(probelist); + if (names) + g_strfreev(names); + + if (ret != SR_OK) { + g_slist_free(probelist); probelist = NULL; } g_strfreev(tokens); - if (range) - g_strfreev(range); return probelist; } -GHashTable *parse_generic_arg(const char *arg) +GHashTable *parse_generic_arg(const char *arg, gboolean sep_first) { GHashTable *hash; int i; @@ -105,10 +160,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); @@ -122,66 +181,6 @@ GHashTable *parse_generic_arg(const char *arg) return hash; } -struct sr_dev *parse_devstring(const char *devstring) -{ - struct sr_dev *dev, *d; - struct sr_dev_driver **drivers; - GSList *devs, *l; - int i, num_devs, dev_num, dev_cnt; - char *tmp; - - if (!devstring) - return NULL; - - dev = NULL; - dev_num = strtol(devstring, &tmp, 10); - if (tmp != devstring) { - /* argument is numeric, meaning a device ID. Make all drivers - * scan for devices. - */ - num_devs = num_real_devs(); - if (dev_num < 0 || dev_num >= num_devs) - return NULL; - - dev_cnt = 0; - devs = sr_dev_list(); - for (l = devs; l; l = l->next) { - d = l->data; - if (sr_dev_has_hwcap(d, SR_HWCAP_DEMO_DEV)) - continue; - if (dev_cnt == dev_num) { - if (dev_num == dev_cnt) { - dev = d; - break; - } - } - dev_cnt++; - } - } else { - /* select device by driver -- only initialize that driver, - * no need to let them all scan - */ - dev = NULL; - drivers = sr_driver_list(); - for (i = 0; drivers[i]; i++) { - if (strcmp(drivers[i]->name, devstring)) - continue; - num_devs = sr_driver_init(drivers[i]); - if (num_devs == 1) { - devs = sr_dev_list(); - dev = devs->data; - } else if (num_devs > 1) { - printf("driver '%s' found %d devices, select by ID instead.\n", - devstring, num_devs); - } - /* fall through: selected driver found no devices */ - break; - } - } - - return dev; -} - char *strcanon(const char *str) { int p0, p1;