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 | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 217 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 3df0069..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
*
@@ -42,6 +44,8 @@
#include "utils.h"
static size_t patternSeparatorShortPos(const char * pattern, size_t len);
+static size_t patternSeparatorPos(const char * pattern, size_t len);
+static size_t cmdSeparatorPos(const char * cmd, size_t len);
/**
* Find the first occurrence in str of a character in set.
@@ -147,7 +151,7 @@
return FALSE;
}
- if (strncasecmp(str1, str2, len2) == 0) {
+ if (SCPI_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
@@ -160,7 +164,7 @@
STATE_TEXT,
STATE_LAST_WHITESPACE,
STATE_COMMA,
- STATE_ERROR,
+ STATE_ERROR
};
typedef enum _locate_text_states locate_text_states;
@@ -175,7 +179,7 @@
/**
* Test locate text state, if it is correct final state
*/
-static inline bool_t isFinalState(locate_text_states state) {
+static bool_t isFinalState(locate_text_states state) {
return (
((state) == STATE_COMMA)
|| ((state) == STATE_LAST_WHITESPACE)
@@ -189,7 +193,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static inline bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -284,7 +288,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static inline bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -365,13 +369,12 @@
size_t skipWhitespace(const char * cmd, size_t len) {
size_t i;
for (i = 0; i < len; i++) {
- if (!isspace((unsigned char)cmd[i])) {
+ if (!isspace((unsigned char) cmd[i])) {
return i;
}
}
return len;
}
-
/**
* Pattern is composed from upper case an lower case letters. This function
@@ -383,11 +386,45 @@
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;
}
}
return i;
+}
+
+/**
+ * Find pattern separator position
+ * @param pattern
+ * @param len - max search length
+ * @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;
+ } else {
+ return separator - pattern;
+ }
+}
+
+/**
+ * Find command separator position
+ * @param cmd - input command
+ * @param len - max search length
+ * @return position of separator or len
+ */
+size_t cmdSeparatorPos(const char * cmd, size_t len) {
+ char * separator = strnpbrk(cmd, len, ":?");
+ size_t result;
+ if (separator == NULL) {
+ result = len;
+ } else {
+ result = separator - cmd;
+ }
+
+ return result;
}
/**
@@ -403,3 +440,174 @@
return compareStr(pattern, pattern_len, str, str_len) ||
compareStr(pattern, pattern_sep_pos_short, str, str_len);
}
+
+/**
+ * Compare pattern and command
+ * @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) {
+ 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);
+
+ 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 {
+ 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;
+}
+
+
+#if !HAVE_STRNLEN
+/* use FreeBSD strnlen */
+
+/*-
+ * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
+ * 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);
+}
+#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