X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=3df04e2a5da487803faf2459a0a3b8fd2711ab07;hp=8d0bbe5da8df7803c1f74855db7e26617d843897;hb=b4d72c27b716b729a35e5d985f11f69ef5e2fa8e;hpb=a2e8008830a99fe0e45399e4360f2d77ce577f2c

diff --git a/parsers.c b/parsers.c
index 8d0bbe5..3df04e2 100644
--- 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>
  *
@@ -17,83 +17,140 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "sigrok-cli.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <libsigrok/libsigrok.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;
-
-	error = FALSE;
-	range = NULL;
-	if (!(probelist = g_try_malloc0(max_probes * sizeof(char *)))) {
-		/* TODO: Handle errors. */
+	struct sr_channel *ch;
+	GSList *l;
+
+	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;
+	int ret, n, b, e, i;
+	char **tokens, **range, **names, *eptr, str[8];
 
+	if (!channelstring || !channelstring[0])
+		/* Use all channels by default. */
+		return g_slist_copy(sdi->channels);
+
+	ret = SR_OK;
+	range = NULL;
+	names = NULL;
+	channellist = NULL;
+	tokens = g_strsplit(channelstring, ",", 0);
 	for (i = 0; tokens[i]; i++) {
+		if (tokens[i][0] == '\0') {
+			g_critical("Invalid empty channel.");
+			ret = SR_ERR;
+			break;
+		}
 		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. */
-				g_critical("Invalid probe syntax '%s'.", 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);
-			if (b < 1 || e > max_probes || b >= e) {
-				g_critical("Invalid probe range '%s'.", 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) {
-				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(sdi->channels, str);
+				if (!ch) {
+					g_critical("unknown channel '%d'.", b);
+					ret = SR_ERR;
+					break;
+				}
+				channellist = g_slist_append(channellist, ch);
 				b++;
 			}
+range_fail:
+			if (range)
+				g_strfreev(range);
+
+			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 channel '%s'.", tokens[i]);
+				g_strfreev(names);
+				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);
+			ch = find_channel(sdi->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);
-	if (range)
-		g_strfreev(range);
 
-	return probelist;
+	return channellist;
 }
 
 GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
@@ -126,7 +183,7 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
 	return hash;
 }
 
-char *strcanon(const char *str)
+static char *strcanon(const char *str)
 {
 	int p0, p1;
 	char *s;