From 2140d423dc485e5d1f3ae2c2aa39d7e28a6069ac Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 19 2月 2016 23:01:08 +0800
Subject: [PATCH] Fix #74 bad handling of incomplete ARB data
---
libscpi/src/utils.c | 412 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 326 insertions(+), 86 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 1d309ec..6d67793 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -4,7 +4,7 @@
* Copyright (c) 2012 Jan Breuer
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -13,7 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -30,16 +30,17 @@
/**
* @file scpi_utils.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief Conversion routines and string manipulation routines
- *
- *
+ *
+ *
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <math.h>
#include "utils_private.h"
#include "scpi/utils.h"
@@ -53,7 +54,7 @@
* @param str
* @param size
* @param set
- * @return
+ * @return
*/
char * strnpbrk(const char *str, size_t size, const char *set) {
const char *scanp;
@@ -74,7 +75,7 @@
* @param str converted textual representation
* @param len string buffer length
* @param base output base
- * @param sign
+ * @param sign
* @return number of bytes written to str (without '\0')
*/
size_t UInt32ToStrBaseSign(uint32_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
@@ -91,21 +92,19 @@
} else {
switch (base) {
- case 2:
+ case 2:
x = 0x80000000L;
break;
case 8:
x = 0x40000000L;
break;
+ default:
case 10:
+ base = 10;
x = 1000000000L;
break;
case 16:
x = 0x10000000L;
- break;
- default:
- x = 1000000000L;
- base = 10;
break;
}
@@ -141,7 +140,7 @@
* @return number of bytes written to str (without '\0')
*/
size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len) {
- return UInt32ToStrBaseSign((int32_t) val, str, len, 10, TRUE);
+ return UInt32ToStrBaseSign((uint32_t) val, str, len, 10, TRUE);
}
/**
@@ -162,7 +161,7 @@
* @param str converted textual representation
* @param len string buffer length
* @param base output base
- * @param sign
+ * @param sign
* @return number of bytes written to str (without '\0')
*/
size_t UInt64ToStrBaseSign(uint64_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) {
@@ -185,15 +184,13 @@
case 8:
x = 0x8000000000000000ULL;
break;
+ default:
case 10:
x = 10000000000000000000ULL;
+ base = 10;
break;
case 16:
x = 0x1000000000000000ULL;
- break;
- default:
- x = 10000000000000000000ULL;
- base = 10;
break;
}
@@ -229,7 +226,7 @@
* @return number of bytes written to str (without '\0')
*/
size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len) {
- return UInt64ToStrBaseSign((int64_t) val, str, len, 10, TRUE);
+ return UInt64ToStrBaseSign((uint64_t) val, str, len, 10, TRUE);
}
/**
@@ -298,7 +295,7 @@
*/
size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) {
char * endptr;
- *val = strtol(str, &endptr, base);
+ *val = strtoll(str, &endptr, base);
return endptr - str;
}
@@ -390,7 +387,7 @@
}
}
} else {
- for (i = len1; i<len2; i++) {
+ for (i = len1; i < len2; i++) {
if (!isdigit((int) str2[i])) {
result = FALSE;
break;
@@ -475,7 +472,7 @@
* @param pattern_len
* @param str
* @param str_len
- * @return
+ * @return
*/
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;
@@ -504,9 +501,11 @@
* @return TRUE if pattern matches, FALSE otherwise
*/
scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len, int32_t default_value) {
+#define SKIP_PATTERN(n) do {pattern_ptr += (n); pattern_len -= (n);} while(0)
+#define SKIP_CMD(n) do {cmd_ptr += (n); cmd_len -= (n);} while(0)
+
scpi_bool_t result = FALSE;
- int leftFlag = 0; // flag for '[' on left
- int rightFlag = 0; // flag for ']' on right
+ int brackets = 0;
int cmd_sep_pos = 0;
size_t numbers_idx = 0;
@@ -514,40 +513,44 @@
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 = SCPIDEFINE_strnlen(cmd, len);
- const char * cmd_end = cmd + cmd_len;
+
+ /* both commands are query commands? */
+ if (pattern_ptr[pattern_len - 1] == '?') {
+ if (cmd_ptr[cmd_len - 1] == '?') {
+ cmd_len -= 1;
+ pattern_len -= 1;
+ } else {
+ return FALSE;
+ }
+ }
/* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
if (pattern_ptr[0] == '[') { // skip first '['
- pattern_len--;
- pattern_ptr++;
- leftFlag++;
+ SKIP_PATTERN(1);
+ brackets++;
}
if (pattern_ptr[0] == ':') { // skip first ':'
- pattern_len--;
- pattern_ptr++;
+ SKIP_PATTERN(1);
}
if (cmd_ptr[0] == ':') {
/* handle errornouse ":*IDN?" */
- if ((cmd_len >= 2) && (cmd_ptr[1] != '*')) {
- cmd_len--;
- cmd_ptr++;
+ if (cmd_len >= 2) {
+ if (cmd_ptr[1] != '*') {
+ SKIP_CMD(1);
+ } else {
+ return FALSE;
+ }
}
}
while (1) {
- int pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_end - pattern_ptr);
+ int pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_len);
- if ((leftFlag > 0) && (rightFlag > 0)) {
- leftFlag--;
- rightFlag--;
- } else {
- cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
- }
+ cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_len);
if ((pattern_sep_pos > 0) && pattern_ptr[pattern_sep_pos - 1] == '#') {
if (numbers && (numbers_idx < numbers_len)) {
@@ -562,85 +565,95 @@
}
if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos, number_ptr)) {
- pattern_ptr += pattern_sep_pos;
- pattern_len -= pattern_sep_pos;
- cmd_ptr = cmd_ptr + cmd_sep_pos;
+ SKIP_PATTERN(pattern_sep_pos);
+ SKIP_CMD(cmd_sep_pos);
result = TRUE;
/* command is complete */
- if ((pattern_ptr == pattern_end) && (cmd_ptr >= cmd_end)) {
+ if ((pattern_len == 0) && (cmd_len == 0)) {
break;
}
/* pattern complete, but command not */
- if ((pattern_ptr == pattern_end) && (cmd_ptr < cmd_end)) {
+ if ((pattern_len == 0) && (cmd_len > 0)) {
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 (cmd_len == 0) {
+ // verify all subsequent pattern parts are also optional
+ while (pattern_len) {
+ pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_len);
+ switch (pattern_ptr[pattern_sep_pos]) {
+ case '[':
+ brackets++;
+ break;
+ case ']':
+ brackets--;
+ break;
+ default:
+ break;
}
- if (']' == pattern_ptr[pattern_end - pattern_ptr - 1]) {
- break; /* exist optional keyword, command is complete */
+ SKIP_PATTERN(pattern_sep_pos + 1);
+ if (brackets == 0) {
+ if ((pattern_len > 0) && (pattern_ptr[0] == '[')) {
+ continue;
+ } else {
+ break;
+ }
}
}
- result = FALSE;
- break;
+ if (pattern_len != 0) {
+ result = FALSE;
+ }
+ break; /* exist optional keyword, command is complete */
}
/* 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 += 1;
- pattern_len -= 1;
- cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
+ if ((pattern_len > 0)
+ && ((pattern_ptr[0] == cmd_ptr[0])
+ && (pattern_ptr[0] == ':'))) {
+ SKIP_PATTERN(1);
+ SKIP_CMD(1);
+ } else if ((pattern_len > 1)
+ && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == '[')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr += 2; // for skip '[' in "[:"
- pattern_len -= 2;
- cmd_ptr = cmd_ptr + 1;
- leftFlag++;
- } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
+ SKIP_PATTERN(2); // for skip '[' in "[:"
+ SKIP_CMD(1);
+ brackets++;
+ } else if ((pattern_len > 1)
+ && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr += 2; // for skip ']' in "]:"
- pattern_len -= 2;
- cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_len > 2) && (pattern_ptr[2] == cmd_ptr[0])
+ SKIP_PATTERN(2); // for skip ']' in "]:"
+ SKIP_CMD(1);
+ brackets--;
+ } else if ((pattern_len > 2)
+ && (pattern_ptr[2] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr += 3; // for skip '][' in "][:"
- pattern_len -= 3;
- 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
+ SKIP_PATTERN(3); // for skip '][' in "][:"
+ SKIP_CMD(1);
+ //brackets++;
+ //brackets--;
} else {
result = FALSE;
break;
}
} else {
- pattern_ptr += pattern_sep_pos;
- pattern_len -= pattern_sep_pos;
+ SKIP_PATTERN(pattern_sep_pos);
if ((pattern_ptr[0] == ']') && (pattern_ptr[1] == ':')) {
- pattern_ptr += 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
- pattern_len -= 2;
- rightFlag++;
+ SKIP_PATTERN(2); // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ brackets--;
} else if ((pattern_len > 2) && (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr += 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
- pattern_len -= 3;
- rightFlag++;
+ SKIP_PATTERN(3); // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ //brackets++;
+ //brackets--;
} else {
result = FALSE;
break;
@@ -649,6 +662,8 @@
}
return result;
+#undef SKIP_PATTERN
+#undef SKIP_CMD
}
/**
@@ -735,3 +750,228 @@
}
#endif
+// Floating point to string conversion routines
+//
+// Copyright (C) 2002 Michael Ringgaard. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the project nor the names of its contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE.
+
+static char *scpi_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf, size_t bufsize) {
+ int r2;
+ double fi, fj;
+ char *p, *p1;
+
+ if (ndigits < 0) ndigits = 0;
+ if (ndigits >= (int) (bufsize - 1)) ndigits = bufsize - 2;
+ r2 = 0;
+ *sign = 0;
+ p = &buf[0];
+ if (arg < 0) {
+ *sign = 1;
+ arg = -arg;
+ }
+ arg = modf(arg, &fi);
+ p1 = &buf[bufsize];
+
+ if (fi != 0) {
+ p1 = &buf[bufsize];
+ while (fi != 0) {
+ fj = modf(fi / 10, &fi);
+ *--p1 = (int) ((fj + .03) * 10) + '0';
+ r2++;
+ }
+ while (p1 < &buf[bufsize]) *p++ = *p1++;
+ } else if (arg > 0) {
+ while ((fj = arg * 10) < 1) {
+ arg = fj;
+ r2--;
+ }
+ }
+ p1 = &buf[ndigits];
+ *decpt = r2;
+ if (p1 < &buf[0]) {
+ buf[0] = '\0';
+ return buf;
+ }
+ while (p <= p1 && p < &buf[bufsize]) {
+ arg *= 10;
+ arg = modf(arg, &fj);
+ *p++ = (int) fj + '0';
+ }
+ if (p1 >= &buf[bufsize]) {
+ buf[bufsize - 1] = '\0';
+ return buf;
+ }
+ p = p1;
+ *p1 += 5;
+ while (*p1 > '9') {
+ *p1 = '0';
+ if (p1 > buf) {
+ ++*--p1;
+ } else {
+ *p1 = '1';
+ (*decpt)++;
+ }
+ }
+ *p = '\0';
+ return buf;
+}
+
+#define SCPI_DTOSTRE_BUFFER_SIZE 310
+
+char * SCPI_dtostre(double __val, char * __s, size_t __ssize, unsigned char __prec, unsigned char __flags) {
+ char buffer[SCPI_DTOSTRE_BUFFER_SIZE];
+
+ int sign = signbit(__val);
+ char * s = buffer;
+ int decpt;
+ if (sign) {
+ __val = -__val;
+ s[0] = '-';
+ s++;
+ } else if (!isnan(__val)) {
+ if (SCPI_DTOSTRE_PLUS_SIGN & __flags) {
+ s[0] = '+';
+ s++;
+ } else if (SCPI_DTOSTRE_ALWAYS_SIGN & __flags) {
+ s[0] = ' ';
+ s++;
+ }
+ }
+
+ if (!isfinite(__val)) {
+ if (isnan(__val)) {
+ strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "NAN" : "nan");
+ } else {
+ strcpy(s, (__flags & SCPI_DTOSTRE_UPPERCASE) ? "INF" : "inf");
+ }
+ strncpy(__s, buffer, __ssize);
+ return __s;
+ }
+
+ scpi_ecvt(__val, __prec, &decpt, &sign, s, SCPI_DTOSTRE_BUFFER_SIZE - 1);
+ if (decpt > 1 && decpt <= __prec) {
+ memmove(s + decpt + 1, s + decpt, __prec + 1 - decpt);
+ s[decpt] = '.';
+ decpt = 0;
+ } else if (decpt > -4 && decpt <= 0) {
+ decpt = -decpt + 1;
+ memmove(s + decpt + 1, s, __prec + 1);
+ memset(s, '0', decpt + 1);
+ s[1] = '.';
+ decpt = 0;
+ } else {
+ memmove(s + 2, s + 1, __prec + 1);
+ s[1] = '.';
+ decpt--;
+ }
+
+ s = &s[__prec];
+ while (s[0] == '0') {
+ s[0] = 0;
+ s--;
+ }
+ if (s[0] == '.') {
+ s[0] = 0;
+ s--;
+ }
+
+ if (decpt != 0) {
+ s++;
+ s[0] = 'e';
+ s++;
+ if (decpt != 0) {
+ if (decpt > 0) {
+ s[0] = '+';
+ }
+ if (decpt < 0) {
+ s[0] = '-';
+ decpt = -decpt;
+ }
+ s++;
+ }
+ UInt32ToStrBaseSign(decpt, s, 5, 10, 0);
+ if (s[1] == 0) {
+ s[2] = s[1];
+ s[1] = s[0];
+ s[0] = '0';
+ }
+ }
+
+ strncpy(__s, buffer, __ssize);
+ return __s;
+}
+
+/**
+ * Get native CPU endiannes
+ * @return
+ */
+scpi_array_format_t SCPI_GetNativeFormat(void) {
+ union {
+ uint32_t i;
+ char c[4];
+ } bint = {0x01020304};
+
+ return bint.c[0] == 1 ? SCPI_FORMAT_BIGENDIAN : SCPI_FORMAT_LITTLEENDIAN;
+}
+
+/**
+ * Swap 16bit number
+ * @param val
+ * @return
+ */
+uint16_t SCPI_Swap16(uint16_t val) {
+ return ((val & 0x00FF) << 8) |
+ ((val & 0xFF00) >> 8);
+}
+
+/**
+ * Swap 32bit number
+ * @param val
+ * @return
+ */
+uint32_t SCPI_Swap32(uint32_t val) {
+ return ((val & 0x000000FF) << 24) |
+ ((val & 0x0000FF00) << 8) |
+ ((val & 0x00FF0000) >> 8) |
+ ((val & 0xFF000000) >> 24);
+}
+
+/**
+ * Swap 64bit number
+ * @param val
+ * @return
+ */
+uint64_t SCPI_Swap64(uint64_t val) {
+ return ((val & 0x00000000000000FFul) << 56) |
+ ((val & 0x000000000000FF00ul) << 40) |
+ ((val & 0x0000000000FF0000ul) << 24) |
+ ((val & 0x00000000FF000000ul) << 8) |
+ ((val & 0x000000FF00000000ul) >> 8) |
+ ((val & 0x0000FF0000000000ul) >> 24) |
+ ((val & 0x00FF000000000000ul) >> 40) |
+ ((val & 0xFF00000000000000ul) >> 56);
+}
\ No newline at end of file
--
Gitblit v1.9.1