From 0fe472e083c40b858202db20f645eb7ac0957b30 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 03 10æ 2013 20:53:58 +0800
Subject: [PATCH] Update comment on boolean parameters
---
libscpi/src/utils.c | 181 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 162 insertions(+), 19 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 583b5f7..0562487 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,33 +151,35 @@
return FALSE;
}
- if (strncasecmp(str1, str2, len2) == 0) {
+ if (SCPI_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
return FALSE;
}
-enum locate_text_states {
+enum _locate_text_states {
STATE_FIRST_WHITESPACE,
STATE_TEXT_QUOTED,
STATE_TEXT,
STATE_LAST_WHITESPACE,
STATE_COMMA,
- STATE_ERROR,
+ STATE_ERROR
};
+typedef enum _locate_text_states locate_text_states;
-struct locate_text_nfa {
- enum locate_text_states state;
+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(enum locate_text_states state) {
+static bool_t isFinalState(locate_text_states state) {
return (
((state) == STATE_COMMA)
|| ((state) == STATE_LAST_WHITESPACE)
@@ -187,7 +193,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static inline bool_t locateTextAutomaton(struct 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:
@@ -227,6 +233,9 @@
nfa->state = STATE_ERROR;
}
break;
+
+ default:
+ break;
}
/* if it is terminating state, break from for loop */
@@ -249,11 +258,10 @@
* @return string str1 contains text and str2 was set
*/
bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- struct locate_text_nfa nfa = {
- .startIdx = 0,
- .stopIdx = 0,
- .state = STATE_FIRST_WHITESPACE,
- };
+ 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])) {
@@ -280,7 +288,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static inline bool_t locateStrAutomaton(struct 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:
@@ -302,6 +310,9 @@
nfa->stopIdx = nfa->i + 1;
}
break;
+
+ default:
+ break;
}
/* if it is terminating state, break from for loop */
@@ -322,11 +333,11 @@
* @return string str1 contains text and str2 was set
*/
bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- struct locate_text_nfa nfa = {
- .startIdx = 0,
- .stopIdx = 0,
- .state = STATE_FIRST_WHITESPACE,
- };
+ 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])) {
@@ -365,6 +376,14 @@
return len;
}
+/**
+ * is colon or not
+ * @param cmd - command
+ * @return
+ */
+static bool_t iscolon(char ch) {
+ return (':' == ch) ? TRUE : FALSE;
+}
/**
* Pattern is composed from upper case an lower case letters. This function
@@ -384,6 +403,41 @@
}
/**
+ * 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;
+}
+
+
+/**
* Match pattern and str. Pattern is in format UPPERCASElowercase
* @param pattern
* @param pattern_len
@@ -396,3 +450,92 @@
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) {
+ int result = FALSE;
+
+ 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 it is possible to send command ":*IDN?" which is incorrect */
+ if (iscolon(cmd_ptr[0])) {
+ 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 (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) {
+ 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 {
+ result = FALSE;
+ break;
+ }
+ } 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