From e75066cc9261c65e835c7caf2e7bc89c7f468bfa Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 27 8月 2015 23:23:35 +0800
Subject: [PATCH] Try to fix travis build

---
 libscpi/src/utils.c |   72 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index e5f4ee9..66dbc64 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -156,6 +156,19 @@
 }
 
 /**
+ * Converts string to unsigned 32bit integer representation
+ * @param str   string value
+ * @param val   32bit integer result
+ * @return      number of bytes used in string
+ */
+size_t strToULong(const char * str, uint32_t * val, int8_t base) {
+    char * endptr;
+    *val = strtoul(str, &endptr, base);
+    return endptr - str;
+}
+
+
+/**
  * Converts string to double representation
  * @param str   string value
  * @param val   double result
@@ -195,7 +208,7 @@
  * @param len2
  * @return TRUE if strings match
  */
-scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2) {
+scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) {
     scpi_bool_t result = FALSE;
     size_t i;
 
@@ -205,12 +218,26 @@
 
     if (SCPIDEFINE_strncasecmp(str1, str2, len1) == 0) {
         result = TRUE;
-    }
 
-    for (i = len1; i < len2; i++) {
-        if (!isdigit(str2[i])) {
-            result = FALSE;
-            break;
+        if (num) {
+            if (len1 == len2) {
+                *num = 1;
+            } else {
+                int32_t tmpNum;
+                i = len1 + strToLong(str2 + len1, &tmpNum, 10);
+                if (i != len2) {
+                    result = FALSE;
+                } else {
+                    *num = tmpNum;
+                }
+            }
+        } else {
+            for (i = len1; i<len2; i++) {
+                if (!isdigit((int) str2[i])) {
+                    result = FALSE;
+                    break;
+                }
+            }
         }
     }
 
@@ -240,7 +267,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t patternSeparatorShortPos(const char * pattern, size_t len) {
+static 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])) {
@@ -256,7 +283,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t patternSeparatorPos(const char * pattern, size_t len) {
+static size_t patternSeparatorPos(const char * pattern, size_t len) {
 
     char * separator = strnpbrk(pattern, len, "?:[]");
     if (separator == NULL) {
@@ -272,7 +299,7 @@
  * @param len - max search length
  * @return position of separator or len
  */
-size_t cmdSeparatorPos(const char * cmd, size_t len) {
+static size_t cmdSeparatorPos(const char * cmd, size_t len) {
     char * separator = strnpbrk(cmd, len, ":?");
     size_t result;
     if (separator == NULL) {
@@ -292,7 +319,7 @@
  * @param str_len
  * @return 
  */
-scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
+scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len, int32_t * num) {
     int pattern_sep_pos_short;
 
     if (pattern[pattern_len - 1] == '#') {
@@ -300,8 +327,8 @@
 
         pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
 
-        return compareStrAndNum(pattern, new_pattern_len, str, str_len) ||
-                compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len);
+        return compareStrAndNum(pattern, new_pattern_len, str, str_len, num) ||
+                compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
     } else {
 
         pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
@@ -318,11 +345,14 @@
  * @param len - max search length
  * @return TRUE if pattern matches, FALSE otherwise
  */
-scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len) {
     scpi_bool_t result = FALSE;
     int leftFlag = 0; // flag for '[' on left
     int rightFlag = 0; // flag for ']' on right
     int cmd_sep_pos = 0;
+
+    size_t numbers_idx = 0;
+    int32_t *number_ptr = NULL;
 
     const char * pattern_ptr = pattern;
     int pattern_len = strlen(pattern);
@@ -361,7 +391,19 @@
             cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
         }
 
-        if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos)) {
+        if (pattern_ptr[pattern_sep_pos - 1] == '#') {
+            if (numbers && (numbers_idx < numbers_len)) {
+                number_ptr = numbers + numbers_idx;
+                *number_ptr = 1; // default value
+            } else {
+                number_ptr = NULL;
+            }
+            numbers_idx++;
+        } else {
+            number_ptr = NULL;
+        }
+
+        if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos, number_ptr)) {
             pattern_ptr = pattern_ptr + pattern_sep_pos;
             cmd_ptr = cmd_ptr + cmd_sep_pos;
             result = TRUE;
@@ -519,7 +561,7 @@
         if (c1 != c2) {
             return c1 - c2;
         }
-        if (c1 = '\0') {
+        if (c1 == '\0') {
             return 0;
         }
     }

--
Gitblit v1.9.1