From cf23c1aa245391e1c531b86386bb216cac72a171 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 07 11æ 2013 22:30:36 +0800
Subject: [PATCH] Resolve bug #10 Multiple commands per package
---
libscpi/src/utils.c | 177 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 118 insertions(+), 59 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 89c7a56..5498cf2 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -1,5 +1,7 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * Copyright (c) 2013 Jan Breuer
+ * Richard.hmm
+ * Copyright (c) 2012 Jan Breuer
*
* All Rights Reserved
*
@@ -367,37 +369,7 @@
size_t skipWhitespace(const char * cmd, size_t len) {
size_t i;
for (i = 0; i < len; i++) {
- if (!isspace((unsigned char)cmd[i])) {
- return i;
- }
- }
- return len;
-}
-
-/**
- * is colon or not. add by hmm 2013.4.1
- * @param cmd - command
- * @return
- */
-static bool_t iscolon(const char * cmd) {
- char* pColon = ":";
- if(0 == SCPI_strncasecmp(cmd, pColon, 1))
- {
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * Count colon from the beggining add by hmm 2013.4.1
- * @param cmd - command
- * @param len - max search length
- * @return number of colon
- */
-size_t skipColon(const char * cmd, size_t len) {
- size_t i;
- for (i = 0; i < len; i++) {
- if (!iscolon(&cmd[i])) {
+ if (!isspace((unsigned char) cmd[i])) {
return i;
}
}
@@ -414,7 +386,7 @@
size_t patternSeparatorShortPos(const char * pattern, size_t len) {
size_t i;
for (i = 0; (i < len) && pattern[i]; i++) {
- if (islower((unsigned char)pattern[i])) {
+ if (islower((unsigned char) pattern[i])) {
return i;
}
}
@@ -428,7 +400,7 @@
* @return position of separator or len
*/
size_t patternSeparatorPos(const char * pattern, size_t len) {
-
+
char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
return len;
@@ -451,10 +423,9 @@
} else {
result = separator - cmd;
}
-
+
return result;
}
-
/**
* Match pattern and str. Pattern is in format UPPERCASElowercase
@@ -472,62 +443,133 @@
/**
* Compare pattern and command
- * @param pattern
+ * @param pattern eg. [:MEASure]:VOLTage:DC?
* @param cmd - command
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
- int result = FALSE;
-
+ bool_t result = FALSE;
+ int leftFlag = 0; // flag for '[' on left
+ int rightFlag = 0; // flag for ']' on right
+ int cmd_sep_pos = 0;
+
const char * pattern_ptr = pattern;
int pattern_len = strlen(pattern);
const char * pattern_end = pattern + pattern_len;
-
+
const char * cmd_ptr = cmd;
size_t cmd_len = SCPI_strnlen(cmd, len);
const char * cmd_end = cmd + cmd_len;
-
+
+ /* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
+ if (pattern_ptr[0] == '[') { // skip first '['
+ pattern_len--;
+ pattern_ptr++;
+ leftFlag++;
+ }
+ if (pattern_ptr[0] == ':') { // skip first ':'
+ pattern_len--;
+ pattern_ptr++;
+ }
+
+ if (cmd_ptr[0] == ':') {
+ /* handle errornouse ":*IDN?" */
+ if((cmd_len >= 2) && (cmd_ptr[1] != '*')) {
+ cmd_len--;
+ cmd_ptr++;
+ }
+ }
+
while (1) {
int pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_end - pattern_ptr);
- int cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
-
+
+ if ((leftFlag > 0) && (rightFlag > 0)) {
+ leftFlag--;
+ rightFlag--;
+ } else {
+ cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
+ }
+
if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos)) {
pattern_ptr = pattern_ptr + pattern_sep_pos;
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
-
+
/* command is complete */
if ((pattern_ptr == pattern_end) && (cmd_ptr >= cmd_end)) {
break;
}
-
+
/* pattern complete, but command not */
if ((pattern_ptr == pattern_end) && (cmd_ptr < cmd_end)) {
result = FALSE;
break;
}
-
+
/* command complete, but pattern not */
if (cmd_ptr >= cmd_end) {
+ if (cmd_end == cmd_ptr) {
+ if (cmd_ptr[0] == pattern_ptr[pattern_end - pattern_ptr - 1]) {
+ break; /* exist optional keyword, command is complete */
+ }
+ if (']' == pattern_ptr[pattern_end - pattern_ptr - 1]) {
+ break; /* exist optional keyword, command is complete */
+ }
+ }
result = FALSE;
break;
}
-
+
/* both command and patter contains command separator at this position */
if ((pattern_ptr[0] == cmd_ptr[0]) && ((pattern_ptr[0] == ':') || (pattern_ptr[0] == '?'))) {
pattern_ptr = pattern_ptr + 1;
cmd_ptr = cmd_ptr + 1;
+ } else if ((pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == '[')
+ && (pattern_ptr[1] == ':')) {
+ pattern_ptr = pattern_ptr + 2; // for skip '[' in "[:"
+ cmd_ptr = cmd_ptr + 1;
+ leftFlag++;
+ } else if ((pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == ':')) {
+ pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:"
+ cmd_ptr = cmd_ptr + 1;
+ } else if ((pattern_ptr[2] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
+ pattern_ptr = pattern_ptr + 3; // for skip '][' in "][:"
+ cmd_ptr = cmd_ptr + 1;
+ leftFlag++;
+ } else if (((pattern_ptr[0] == ']')
+ || (pattern_ptr[0] == '['))
+ && (*(pattern_end - 1) == '?') // last is '?'
+ && (cmd_ptr[0] == '?')) {
+ result = TRUE; // exist optional keyword, and they are end with '?'
+ break; // command is complete OK
} else {
result = FALSE;
break;
}
} else {
- result = FALSE;
- break;
+ pattern_ptr = pattern_ptr + pattern_sep_pos;
+ if ((pattern_ptr[0] == ']') && (pattern_ptr[1] == ':')) {
+ pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ rightFlag++;
+ } else if ((pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
+ pattern_ptr = pattern_ptr + 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ rightFlag++;
+ } else {
+ result = FALSE;
+ break;
+ }
}
}
-
+
return result;
}
@@ -540,15 +582,32 @@
* All rights reserved.
*/
size_t
-BSD_strnlen(const char *s, size_t maxlen)
-{
- size_t len;
-
- for (len = 0; len < maxlen; len++, s++) {
- if (!*s)
- break;
- }
- return (len);
+BSD_strnlen(const char *s, size_t maxlen) {
+ size_t len;
+
+ for (len = 0; len < maxlen; len++, s++) {
+ if (!*s)
+ break;
+ }
+ return (len);
+}
+#endif
+
+#if !HAVE_STRNCASECMP && !HAVE_STRNICMP
+int OUR_strncasecmp(const char *s1, const char *s2, size_t n) {
+ unsigned char c1, c2;
+
+ for(; n != 0; n--) {
+ c1 = tolower((unsigned char)*s1++);
+ c2 = tolower((unsigned char)*s2++);
+ if (c1 != c2) {
+ return c1 - c2;
+ }
+ if (c1 = '\0') {
+ return 0;
+ }
+ }
+ return 0;
}
#endif
--
Gitblit v1.9.1