X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=d92218f8664ed5a8858e32a6b631b8d4c68633aa;hp=5652b78dc096eaf3ef95d43e63e61a6f656eb891;hb=HEAD;hpb=cfad6a304754649dbd8841af8a15ddba16a69cc6 diff --git a/parsers.c b/parsers.c index 5652b78..2aacefb 100644 --- a/parsers.c +++ b/parsers.c @@ -25,7 +25,8 @@ #include #include "sigrok-cli.h" -struct sr_channel *find_channel(GSList *channellist, const char *channelname) +struct sr_channel *find_channel(GSList *channellist, const char *channelname, + gboolean exact_case) { struct sr_channel *ch; GSList *l; @@ -33,8 +34,13 @@ struct sr_channel *find_channel(GSList *channellist, const char *channelname) ch = NULL; for (l = channellist; l; l = l->next) { ch = l->data; - if (!strcmp(ch->name, channelname)) - break; + if (exact_case) { + if (strcmp(ch->name, channelname) == 0) + break; + } else { + if (g_ascii_strcasecmp(ch->name, channelname) == 0) + break; + } } ch = l ? l->data : NULL; @@ -105,7 +111,7 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring) ret = SR_ERR; break; } - ch = find_channel(channels, str); + ch = find_channel(channels, str, TRUE); if (!ch) { g_critical("unknown channel '%d'.", b); ret = SR_ERR; @@ -130,7 +136,7 @@ range_fail: break; } - ch = find_channel(channels, names[0]); + ch = find_channel(channels, names[0], TRUE); if (!ch) { g_critical("unknown channel '%s'.", names[0]); g_strfreev(names); @@ -139,8 +145,7 @@ range_fail: } if (names[1]) { /* Rename channel. */ - g_free(ch->name); - ch->name = g_strdup(names[1]); + sr_dev_channel_name_set(ch, names[1]); } channellist = g_slist_append(channellist, ch); @@ -267,30 +272,110 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s, return !error; } -GHashTable *parse_generic_arg(const char *arg, gboolean sep_first) +/** + * Split an input text into a key and value respectively ('=' separator). + * + * @param[in] text Writeable copy of the input text, gets modified. + * @param[out] key Position of the keyword. + * @param[out] val Position of the value. + * + * TODO In theory the returned key/value locations could be const pointers. + * Which even would be preferrable. Unfortunately most call sites deal with + * glib hashes, and their insert API seriously lacks the const attribute. + * So we drop it here as well to avoid clutter at callers'. + */ +static void split_key_value(char *text, char **key, char **val) +{ + char *k, *v; + char *pos; + + if (key) + *key = NULL; + if (val) + *val = NULL; + if (!text || !*text) + return; + + k = text; + v = NULL; + pos = strchr(k, '='); + if (pos) { + *pos = '\0'; + v = ++pos; + } + if (key) + *key = k; + if (val) + *val = v; +} + +/** + * Create hash table from colon separated key-value pairs input text. + * + * Accepts input text as it was specified by users. Splits the colon + * separated key-value pairs and creates a hash table from these items. + * Optionally supports special forms which are useful for different CLI + * features. + * + * Typical form: =[:=]* + * Generic list of key-value pairs, all items being equal. Mere set. + * + * ID form: [:=]* + * First item is not a key-value pair, instead it's an identifier. Used + * to specify a protocol decoder, or a device driver, or an input/output + * file format, optionally followed by more parameters' values. The ID + * part of the input spec is not optional. + * + * Optional ID: [=][:=]* + * All items are key-value pairs. The first item _may_ be an identifier, + * if its key matches a caller specified key name. Otherwise the input + * text is the above typical form, a mere list of key-value pairs while + * none of them is special. + * + * @param[in] arg Input text. + * @param[in] sep_first Boolean, whether ID form is required. + * @param[in] key_first Keyword name if optional ID is applicable. + * + * @returns A hash table which contains the key/value pairs, or #NULL + * when the input is invalid. + */ +GHashTable *parse_generic_arg(const char *arg, + gboolean sep_first, const char *key_first) { GHashTable *hash; + char **elements; int i; - char **elements, *e; + char *k, *v; if (!arg || !arg[0]) return NULL; + if (key_first && !key_first[0]) + key_first = NULL; - i = 0; - hash = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); elements = g_strsplit(arg, ":", 0); - 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); - else { - *e++ = '\0'; - g_hash_table_insert(hash, g_strdup(elements[i]), g_strdup(e)); + i = 0; + if (sep_first) { + k = g_strdup("sigrok_key"); + v = g_strdup(elements[i++]); + g_hash_table_insert(hash, k, v); + } else if (key_first) { + split_key_value(elements[i], &k, &v); + if (g_ascii_strcasecmp(k, key_first) == 0) { + k = "sigrok_key"; } + k = g_strdup(k); + v = g_strdup(v); + g_hash_table_insert(hash, k, v); + i++; + } + for (; elements[i]; i++) { + if (!elements[i][0]) + continue; + split_key_value(elements[i], &k, &v); + k = g_strdup(k); + v = v ? g_strdup(v) : NULL; + g_hash_table_insert(hash, k, v); } g_strfreev(elements); @@ -366,11 +451,11 @@ GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genarg 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)); + gvar = g_variant_new_int32(strtol(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)); + gvar = g_variant_new_uint64(strtoull(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)) { @@ -463,7 +548,7 @@ int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts) if (!arg) return FALSE; - drvargs = parse_generic_arg(arg, TRUE); + drvargs = parse_generic_arg(arg, TRUE, NULL); drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key")); g_hash_table_remove(drvargs, "sigrok_key");