From 6416009acc49af3c67635b6a2e0bedae079bab6b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 09 10月 2013 16:11:29 +0800
Subject: [PATCH] Add define for C30 not to have strnlen, strncasecmp
---
libscpi/src/utils.c | 402 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 198 insertions(+), 204 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 0c54ed3..f8e09fa 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.
@@ -70,7 +74,9 @@
* @param len string buffer length
* @return number of bytes written to str (without '\0')
*/
-size_t longToStr(int32_t val, char * str, size_t len) {
+// TODO: add support for other bases
+
+size_t longToStr(int32_t val, char * str, size_t len, int8_t base) {
uint32_t x = 1000000000L;
int_fast8_t digit;
size_t pos = 0;
@@ -116,9 +122,9 @@
* @param val 32bit integer result
* @return number of bytes used in string
*/
-size_t strToLong(const char * str, int32_t * val) {
+size_t strToLong(const char * str, int32_t * val, int8_t base) {
char * endptr;
- *val = strtol(str, &endptr, 0);
+ *val = strtol(str, &endptr, base);
return endptr - str;
}
@@ -147,208 +153,12 @@
return FALSE;
}
- if (strncasecmp(str1, str2, len2) == 0) {
+ if (SCPI_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
return FALSE;
}
-
-enum _locate_text_states {
- STATE_FIRST_WHITESPACE,
- STATE_TEXT_QUOTED,
- STATE_TEXT,
- STATE_LAST_WHITESPACE,
- STATE_COMMA,
- STATE_ERROR,
-};
-typedef enum _locate_text_states locate_text_states;
-
-struct _locate_text_nfa {
- locate_text_states state;
- int32_t startIdx;
- int32_t stopIdx;
- size_t i;
-};
-typedef struct _locate_text_nfa locate_text_nfa;
-
-/**
- * Test locate text state, if it is correct final state
- */
-static inline bool_t isFinalState(locate_text_states state) {
- return (
- ((state) == STATE_COMMA)
- || ((state) == STATE_LAST_WHITESPACE)
- || ((state) == STATE_TEXT) ||
- ((state) == STATE_FIRST_WHITESPACE)
- );
-}
-
-/**
- * Perform locateText automaton to search string pattern
- * @param nfa stores automaton state
- * @param c current char processed
- */
-static inline bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
- switch(nfa->state) {
- /* first state locating only white spaces */
- case STATE_FIRST_WHITESPACE:
- if(isspace(c)) {
- nfa->startIdx = nfa->stopIdx = nfa->i + 1;
- } else if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (c == '"') {
- nfa->startIdx = nfa->i + 1;
- nfa->state = STATE_TEXT_QUOTED;
- } else {
- nfa->startIdx = nfa->i;
- nfa->stopIdx = nfa->i + 1;
- nfa->state = STATE_TEXT;
- }
- break;
- /* state locating any text inside "" */
- case STATE_TEXT_QUOTED:
- if(c == '"') {
- nfa->state = STATE_LAST_WHITESPACE;
- nfa->stopIdx = nfa->i;
- }
- break;
- /* locate text ignoring quotes */
- case STATE_TEXT:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->stopIdx = nfa->i + 1;
- }
- break;
- /* locating text after last quote */
- case STATE_LAST_WHITESPACE:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->state = STATE_ERROR;
- }
- break;
- }
-
- /* if it is terminating state, break from for loop */
- if ((nfa->state == STATE_COMMA) || (nfa->state == STATE_ERROR)) {
- return FALSE;
- } else {
- return TRUE;
- }
-}
-
-/**
- * Locate text in string. Text is separated by two ""
- * example: "text", next parameter
- * regexp: ^[ \t\r\n]*"([^"]*)"[ \t\r\n]*,?
- * regexp: ^[ \t\r\n]*([^,]*)[ \t\r\n]*,?
- * @param str1 string to be searched
- * @param len1 length of string
- * @param str2 result
- * @param len2 length of result
- * @return string str1 contains text and str2 was set
- */
-bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- locate_text_nfa nfa;
- nfa.state = STATE_FIRST_WHITESPACE;
- nfa.startIdx = 0;
- nfa.stopIdx = 0;
-
- for (nfa.i = 0; nfa.i < len1; nfa.i++) {
- if(FALSE == locateTextAutomaton(&nfa, str1[nfa.i])) {
- break;
- }
- }
-
- if (isFinalState(nfa.state)) {
-
- if (str2) {
- *str2 = &str1[nfa.startIdx];
- }
-
- if (len2) {
- *len2 = nfa.stopIdx - nfa.startIdx;
- }
- return TRUE;
- }
- return FALSE;
-}
-
-/**
- * Perform locateStr automaton to search string pattern
- * @param nfa stores automaton state
- * @param c current char processed
- */
-static inline bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
- switch(nfa->state) {
- /* first state locating only white spaces */
- case STATE_FIRST_WHITESPACE:
- if(isspace(c)) {
- nfa->startIdx = nfa->stopIdx = nfa->i + 1;
- } else if (c == ',') {
- nfa->state = STATE_COMMA;
- } else {
- nfa->startIdx = nfa->i;
- nfa->stopIdx = nfa->i + 1;
- nfa->state = STATE_TEXT;
- }
- break;
- /* locate text ignoring quotes */
- case STATE_TEXT:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->stopIdx = nfa->i + 1;
- }
- break;
- }
-
- /* if it is terminating state, break from for loop */
- if ((nfa->state == STATE_COMMA) || (nfa->state == STATE_ERROR)) {
- return FALSE;
- } else {
- return TRUE;
- }
-}
-
-/**
- * Locate string in string.
- * regexp: ^[ \t\r\n]*([^,]*)[ \t\r\n]*,?
- * @param str1 string to be searched
- * @param len1 length of string
- * @param str2 result
- * @param len2 length of result
- * @return string str1 contains text and str2 was set
- */
-bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- locate_text_nfa nfa;
- nfa.state = STATE_FIRST_WHITESPACE;
- nfa.startIdx = 0;
- nfa.stopIdx = 0;
-
-
- for (nfa.i = 0; nfa.i < len1; nfa.i++) {
- if(FALSE == locateStrAutomaton(&nfa, str1[nfa.i])) {
- break;
- }
- }
-
- if (isFinalState(nfa.state)) {
-
- if (str2) {
- *str2 = &str1[nfa.startIdx];
- }
-
- if (len2) {
- *len2 = nfa.stopIdx - nfa.startIdx;
- }
- return TRUE;
- }
- return FALSE;
-}
-
/**
* Count white spaces from the beggining
@@ -359,13 +169,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
@@ -377,11 +186,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;
}
/**
@@ -397,3 +240,154 @@
return compareStr(pattern, pattern_len, str, str_len) ||
compareStr(pattern, pattern_sep_pos_short, str, str_len);
}
+
+/**
+ * Compare pattern and command
+ * @param pattern
+ * @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
+
+ 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;
+
+ /* TODO: 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++;
+ }
+
+ /* errornouse ":*IDN?" is handled in parser */
+ if (cmd_ptr[0] == ':') {
+ cmd_len--;
+ cmd_ptr++;
+ }
+
+ while (1) {
+ int pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_end - pattern_ptr);
+ int cmd_sep_pos;
+
+ 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
+
--
Gitblit v1.9.1